Comment out name/email in gitconfig/hgrc by default
Remove my hostname from deploy/osx
Merge branch 'master' into develop
Add tmux-powerline to tmux config
Merge remote-tracking branch 'benohara/master' into develop

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