Updates, more tweaks for centos stuff
Merge branch 'master' of github.com:lornix/vim-setup

Conflicts:
	.bashrc_master