Merge pull request #974 from ahomatthew/develop

Develop
Brace yourself for merge conflicttttt
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
More stuff
Merge pull request #975 from brooksryba/develop

Develop
Fixed some bugss