specified ruby version in .travis.yml
Merge branch 'master' into testing
Merge pull request #4 from nealcpeters/testing

Testing