Minor changes.
Merge branch 'master' of github.com:scottkirkwood/vim-scottkirkwood

Merge