Removes .bashrc
Autorenmae on tmux
Remove machine specific stuff to machine-specific .zshrc
Cleans up comments
Merge branch 'master' of github.com:bhb/dotfiles

Conflicts:
	.zshrc
Fixes bad merge