Cleaned up and added Rakefile