bashrc: Better merge that attempts to rebase. Add gclean command to remove unused branches.
bashrc: Better merge that attempts to rebase. Add gclean command to remove unused branches.

shakefu/home,shakefu/home,shakefu/home