self tmux.conf & vimrc
Merge branch 'master' of https://github.com/square/maximum-awesome

Conflicts:
	tmux.conf