Add todo.cfg, update aliases and colors

Conflicts:
	shell/functions.sh
Add rebasing/merging cases to git prompt

Conflicts:
	shell/git.sh