clean up Rakefile & fix gem task so that it depends on bootstrap