leftovers from general updates
tmux conf to dotfiles, remove silly syntax highlight in shell
Merge branch 'works-in-mac' of github.com:jphenow/dotfiles into works-in-mac

Conflicts:
	vim/vimrc.symlink
Merge branch 'works-in-mac'