Cleaned up local/etc/vim
Merge branch 'master' of github.com:xj9/usr