Gemfile fix
Cleaning Rakefile, renaming rake tasks