fixed syntax and various cleanup
Merge branch 'master' of github.com:bendik/spacetravel