Big cleanup. No longer using erb or yaml. Rakefile refactored