escape typo in tmux.conf, install.sh permissions
Merge branch 'master' of https://github.com/squarism/dotfiles

Conflicts:
	tmux.conf