Prep work for icons
Merge branch 'master' of https://github.com/gavinblair/weather