cleaned up a lot
Merge branch 'master' of github.com:shmup/.vim