Remove trailing white-spaces
Use https://rubygems.org in Gemfile
Minor cleanup
Fix tests