Removed some old settings and filetype autocmd
Merge branch 'master' of github.com:roblund/dotvim