Move filetype info to .vimrc
Merge branch 'master' into plugins

Conflicts:
	vimrc