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
wercker yml yay
wrong file name
right file name
Merge branch 'develop' of https://github.com/brooksryba/SimpleSeer into develop
blanking out tests temporarily to get a passing build on wercker
changing back file
Merge branch 'master' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
merging changes by tendrid
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #6 from sightmachine/develop

merge
upgrade scipy version
Merge pull request #1181 from oostendo/develop

upgrade scipy
Merge pull request #1180 from nuzz/develop

add wercker.yml to project
Fixes SHAN-60