Changes to view and stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #648 from brooksryba/develop

Develop