Add Git and Git Flow completions for Bash
Fix: octaverc sets XTERM env variable correctly.
Fix: Git Flow completions and Zsh syntax coloring
Source aliases and environment variables

bash_profile and zshrc-local will source aliases and environment variables from
the same scripts. shell/prompt-bash.sh will hold bash-specific settings for the
command prompt.
Remove unused Pry themes
Consolidates settings common to both zsh and bash.

- zshrc.local and bash_profile now load dotfiles common to both from common
  sources.

- shell-specific commands are in prompt-zsh.sh and prompt-bash.sh

- git prompt functions refactored for cross-shell portability
Remove outdated comment from git.sh
Fix coloring in git prompt
Add omnicompletion
Add diff and mergetool to git aliases
Remove outdated sshconfig entries
Update git message.
Update gitconfig and gitignore
Have vimrc fail gracefully
Add local vimrc.bundles
Dry up gitconfig
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