Merge pull request #149 from austinbeam/feature/weather_sunrise_sunset

Base Weather Icons on Sunrise/Sunset Times
Fix weather indentation.
Merge remote-tracking branch 'upstream/master'