Updated vimrc
Merge branch 'master' of git://github.com/DevanR/dotvim