Merge pull request #1094 from brooksryba/develop

Develop
Moar stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop