Modify .vimrc
Update .vimrc some more
Merge branch 'master' of https://github.com/whoshuu/dev