Disable worker config
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Seer stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Timeout larger
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1130 from demaagdk/develop

Remove _connection error message
Image list with capture pull up new scan. Seer app can recover from panic mode now
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1128 from brooksryba/develop

Develop
woot
Merge branch 'develop' of git://github.com/sightmachine/SimpleSeer into develop
Added monitor paster template and also supervisor_monitor.conf paster
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1131 from brooksryba/develop

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