Edited .vimrc leaving only two bundles in.
Added +x to ServerSync.sh.
Removed push setting in .gitconfig.
Merge branch 'master' into server
Merge branch 'master' into server

Conflicts:
	.gitconfig
Merge branch 'master' into server
Merge branch 'master' into server
Merge branch 'master' into server
Merge branch 'master' into server
Merge branch 'master' into server
Set PATH.