Modified tmux.conf
Modified tmux.conf to hostname based setup
Merge branch 'master' of https://github.com/msymonds/dotfiles

Conflicts:
	home/.ssh/known_hosts2