tabs
github username
more ssh hosts
new chrome spam filter
newer go mode
Merge branch 'master' of github.com:martine/config

Conflicts:
	ssh/config