Comment out name/email in gitconfig/hgrc by default
Remove my hostname from deploy/osx
Comment out packages in deploy/packages/*
Merge branch 'master' into develop
Add tmux-powerline to tmux config
fix typo
Merge pull request #4 from elbrum/typos

fix typo
fix
fix
fix
Merge remote-tracking branch 'upstream/master'
bring back into sync with upstream
Merge remote-tracking branch 'benohara/master' into develop

Conflicts:
	deploy/osx
	git/gitconfig
	mercurial/hgrc
	tmux/tmux.conf
fix
fix
Updates
no tmux powerline
fix
comment out packages by default
fix