Update to new and improved Rakefile