Fixes Bug 935766 - reworked all default ini-dist

The default *.ini-dist files are a conglomerate of outdated values that don't work out of the box.  This PR is a reworking of those files to be minimal and work in the vagrant vm without modification.  

All common resources have been moved into "+include" files. Duplicated values between the the includes and the master files are removed rather than commented out.  This is because it is very confusing to think that a commented out value can simply be uncommented to override when that is not strictly true. The underlying ini file reader ConfigObj freaks out at duplicated values and doesn't give good error message.  I think it is best just to avoid the temptation of overriding in a way that invariable leads to confusing error messages.