Lots of good changes
Merge branch 'master' of github.com:aza/nightsky