Merge branch 'master' of github.com:the9ball/.vim
[.vimrc] filetype on