Merge pull request #1049 from brooksryba/develop

Develop
Turking two point oh
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1050 from ahomatthew/develop

STUFFFFf
Addded jsonp status request view
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop