Update some file type detection
Merge branch 'master' of github.com:rdeits/config

Conflicts:
	sublime-config/Matlab.sublime-settings
	sublime-config/XML.sublime-settings