Merge pull request #1019 from sightmachine/develop

shannon merge
Merge pull request #1025 from sightmachine/develop

Push for shannon
Merge pull request #1162 from sightmachine/develop

Merge for Shannon Deploy 2013-10-23
Merge
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1167 from brooksryba/develop

Develop
Updates to table not refreshing with cache interval
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Fix
Fix
Merge pull request #1168 from ahomatthew/develop

Updates to table not updating with cache interval
Fix for textwidget not rendering properly
Merge pull request #1169 from ahomatthew/develop

Fix for textwidget not rendering properly
Added number pagination for shannon
Merge pull request #1170 from demaagdk/develop

This line is flooding OLAP log with un-helpful message
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Added new alt config file rules in session
Merge pull request #1171 from sightmachine/develop

Latest (final) fixes for JNAP
Moved default supervisor conf files to /settings/conf.d/ and updated deploy command script
Fixes SSEER-71 and Fixes SSEER-121