Merge pull request #969 from ahomatthew/develop

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