Updated to let users aggregate to annual average

[caparker]

Also added the ability to change the base table from hourly to daily, though this has not been implimented yet.