Stuff 'n things
Merge branch 'master' of https://github.com/schme/common_files

Conflicts:
	vim/vimrc
YouCompleteMe for Linux (I think)