cleaned up utils, regenerated moon data
Merge branch 'master' into Ed