aliases
stgit color and chainreply
update certificates to be ca based
Merge branch 'master' of github.com:chazy/settings

Conflicts:
	aliases