Merge pull request #35 from ahsterling/weather

Weather
navbar changes
Merge branch 'master' into steph
Merge pull request #36 from ahsterling/steph

Steph
other weather changes
Merge branch 'master' into weather
weather
removes cronjob, formats decimal
weather stuff
moves weather out of nav bar