Overhaul Rakefile