updated
Merge branch 'master' of github.com:ejima/dotfiles

Conflicts:
	.tmux.conf