Consolidate github scripts, improve git hist formatting
Fix modularization mistakes

Conflicts:
	shell/git.sh
Fix git prompt wrapping in Zshell
Add todo.cfg, update aliases and colors
Add rebasing/merging cases to git prompt