Fix up rakefile and gemfile