trash
Merge branch 'master' of https://github.com/carpedm20/dotfiles

Conflicts:
	vim/.netrwhist
update tmux