Merge pull request #58 from badnack/master

merging
Merge pull request #62 from badnack/master

Die hard!
Merge remote-tracking branch 'upstream/master'
Merge pull request #63 from badnack/master

merging
Merge branch 'development'
Merge pull request #66 from badnack/master

merging development
Update README.md
Merge branch 'development'
Merge pull request #68 from badnack/master

Update README.md
Update README.md
Update README.md
Update README.md
preparing env for tests
removed maps
keep on removing maps
Merge pull request #71 from badnack/tests

Tests
Merge branch 'Tests' of https://github.com/scalableinternetservices/Suppr into test
seeds merge
run server setup script in deploy.rb--executed when you run 'cap production deploy'
none