no change to fluxbox init except ordering
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)
Merge branch 'master' of https://github.com/joeytwiddle/rc_files