Merge pull request #647 from brooksryba/develop

Develop
Changes to view and stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop