Merge pull request #937 from brooksryba/develop

Develop
Cleaning everything up
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop