Changes from laptop
Merge branch 'master' of https://github.com/j201/vimrc