Merge
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1131 from brooksryba/develop

Develop
Added kiosk.sh to paster templates
Updated browser conf file
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop