Clean the Rakefile a little
Improve the README instructions