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
Added number pagination for shannon
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Added new alt config file rules in session
Moved default supervisor conf files to /settings/conf.d/ and updated deploy command script
Fixes SSEER-71 and Fixes SSEER-121
Fixes for supervisor worker signal
Fix stupid, stupid js date bug
Merge pull request #1173 from brooksryba/develop

Develop
Merge branch 'JNAP' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Removing session test
Got the model unit test working. Fixed problems with the user model
Moved tests to correct type folder. Seer test runs unit by default only
removing deprecated tests
Friendly FrameFeature repr. SSEER-136
Quick fix for table
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into settings