Unified vim configuration
This seems to be busted
Bad at merging is git
Use include if it's not there
Merge branch 'master' into linny