first commit after big mess up and new repo
Merge branch 'master' of github.com:ryanjdillon/geosetup