Bunch of cleanup and work on GUI. Nearing final release.
Merge branch 'master' of https://github.com/jml16/maps