Merge branch 'master' into ycm

Conflicts:
	vimrc
Merge branch 'ycm' of https://github.com/cadyyan/dotfiles into ycm

Conflicts:
	git-achievements
	vimrc