update some things
Merge branch 'master' of github.com:apaslak/homesick

Conflicts:
	home/.tmux.conf
	home/.vimrc.after