Change Rakefile to handle cloning