Updated bootstrap and modified rakefile a bit