Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
update numpy version to solve datetime sorting problem in pandas
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
removed old line referencing broker
Merge branch 'develop' of git://github.com/sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:Tendrid/SimpleSeer into develop
Slipped past
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1120 from Tendrid/develop

Tolerance importing
Merge pull request #1117 from nuzz/develop

removed reference to broker
Merge pull request #1122 from brooksryba/develop

Develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Workers timeout gracefully
Merge pull request #1123 from brooksryba/develop

Develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Fix indentation bug/return in states that prevented state transition
Merge pull request #1090 from demaagdk/develop

Use feature factory when running inspections
Reworking and commenting realtime.py along with changes to the default supervisor conf files
Added rabbitmq.sh and supervisor.conf files to the paster world