wip
Merge branch 'master' of https://github.com/gcavn/dotfiles

* 'master' of https://github.com/gcavn/dotfiles:
  wip

Conflicts:
	.tmux.conf