Removed openssl-nonblock, as it is no longer necessary
Added .travis.yml
Merge pull request #17 from Aaron1011/travis

Added .travis.yml
Fix merge conflict in Gemfile
Fix incorrectly merged PR #16