Get rid of annoying problem where user isn't saving
Merge branch 'master' of github.com:openskye/openskye