Clean up rakefile now that new scheme works
Clean up rakefile now that new scheme works

closes #438

mirah/mirah,felixvf/mirah,felixvf/mirah,mirah/mirah,felixvf/mirah,mirah/mirah,mirah/mirah,felixvf/mirah