Update .tmux.conf
Update .vimrc
Merge remote-tracking branch 'origin/master' into dev/air

Conflicts:
	.tmux.conf
	.vimrc