Add Gemfile
Clean up Rakefile and gemspec
Merge remote branch 'github/master'