misc
Merge branch 'master' of github.com:oren/dotfiles

Conflicts:
	ubuntu-server/bash_aliases
	ubuntu-server/tmux.conf