updating .vimrc with some small visual changes
adding rsync-git alias
Merge branch 'mac'

Conflicts:
	.bashrc