Fix filetype detection issues
Merge branch 'master' of github.com:Keithbsmiley/dotfiles