vim updates
Rewrite Rakefile