File encoding and file type
Merge branch 'master' of github.com:rey/.vim