Prevent fozzie from being aliased with UCSD laptop
Merge branch 'master' of github.com:alexras/dotfiles

Conflicts:
	bin/site_dotfiles.py