20140623
Merge branch 'master' of github.com:notmii/.files

Conflicts:
	tmux.conf
	vimrc