Friendlier customization

Previously doing more than superficial changes would result in a dirty
working directory.

In addition some changes in your local configuration would not overrule
upstream configuration files.

This commit fixes both those issues.