Adding initial version of tmux.conf
Merge branch 'master' of https://github.com/ticky/dotfiles
Updating readme with info on updated inheritance model and noting support for tmux.
Merge branch 'master' into nextgen-inheritance-upgrade

Conflicts:
	readme.md