Refactored rakefile, updated vim plugins