wtf
always use tmux in terminals, exit shell when we exit tmux
Merge remote-tracking branch 'origin/master' into servy

Conflicts:
	.vim/bundle/vim-easymotion.git