update
Merge branch 'master' of https://github.com/strozw/dotfiles

Conflicts:
	_tmux.conf
	_vimrc