Add escape-time into .tmux.conf
Merge some Abby settings

Conflicts:
	.gitconfig