Updates to config files from setting up Mac Pro
Config changes for G
Add tmux config
Recent changes.
Merge in branch with work changes.

Conflicts:
	.gitmodules