Update Rakefile to use new goodness
More changes to bring up-to-date with new rake helpers, etc