updates
Merge branch 'master' of github.com:ratbeard/dotfiles

Conflicts:
	tmux/tmux.conf.symlink