Update dotfiles
Merge branch 'master' of github.com:dameleon/dotfiles

Conflicts:
	.tmux.conf
	.vim/.netrwhist
	.vimrc