[skip] Always use color with `ls` (1m)
Added an alias for creating an empty commit
Shortened the alias for listing git branches
Rewrote the gmerge suite of functions