A few color output fixes
Falls back to $HOME if $XDG_CONFIG_HOME is unset
Merging
A ton of refactoring...much cleaner, but not stable!