no change to fluxbox init except ordering
keybindings to comment HTML
added try catch on 'try' but might be better on 'tryc'
TODO notes for cleanup
don't actually set hicolor xterm; I decided I like my colors consistent everywhere, even if they are limited
Augmented gbd to mark whether branches have been merged or not
gbd now shows branches with most recent first (it feels wrong this way, but I cannot explain why)
Show gbd in ascending date order
Merge branch 'master' of https://github.com/joeytwiddle/rc_files
Merge branch 'gbd_ascending_order'
added workaround :StopUpdatingConque until I fix this properly
git_branch_status now sort by date (no longer name)
Merge remote-tracking branch 'origin/master' into mac_compat_DEV

Conflicts:
	j/config/auto.sh/git_aliases
altered gbd and gbs to accept '-M' argument, disabled by default
Merge branch 'master' into mac_compat_dev
bugfix: need_pager was always set
Documented git_aliases for other humans
Documented git_aliases for other humans
Cache git passwords in memory to avoid retyping them all day.
Ctrl-C and Ctrl-V bindings to match other editors/apps