add local modifications to vim config
Merge branch 'master' of github.com:simonhicks/dotfiles
add active.vim
new commits to active.vim