Fixes #542
attrsOf
attrs
This makes sure that values added to programs.git.aliases or programs.git.extraConfig are merged as expected. Also add a few option examples.