clean up some testing code and configurations
Update .travis.yml
Update README.md
Update README.md
Update README.md
Merge pull request #16 from pestrada/test-cleanup

Test cleanup
Fix conflict in env.rb and user.feature files
Fix broken test in change from Poltergeist to Selenium driver