Made some small changes
Merge branch 'master' of https://github.com/jason-riddle/vim
Merge conflict