2 space indent by default
Remove explicit markdown filetype setting
Merge branch 'master' of https://github.com/christoomey/dotfiles