Updated .tmux.conf to use screen-256color instead of xterm-256color.
Removed extra files.
Merge branch 'master' of https://github.com/zeptonaut/preferences

Conflicts:
	emacs/.emacs.d/init/common.el