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 branch 'master' of github.com:sightmachine/SimpleSeer into develop