Fix yankring and syntastic broken ness
Merge branch 'master' of https://github.com/tommymcguiver/vimfiles

Conflicts:
	vimrc