Updates to vimrc and features added to Rakefile