Added badge to README and added .travis.yml
Resolved merge conflicts, added rake to Gemfile
Added coveralls
Updated Gemfile.lock