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

Develop
Merge pull request #1132 from ahomatthew/develop

Monitor, kiosk, paster templates, conf files
Updates to hostname specific monitor funcs
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop