Merge branch 'master' of https://github.com/adambard/vimrc
Merged with changes from home