Readds changes
Merge branch 'master' of https://github.com/Pumafied/DotFiles

Conflicts:
	vim/filetype.vim