Ugh, fix missing and unused files
Fix Rakefile
Bump gems
Add rake to Gemfile
Bring in testing from 3.3