Fixes a bug where default settings always dominated config files.
Fixes a bug where default settings always dominated config files.

git-svn-id: 42af35d80111c0a63d26505f5f279a5822402eca@232 19e92222-5c0b-0410-8929-a290d50e31e9

tuvistavie/puma,BenV/puma,zapnap/puma,calavera/puma,eileencodes/puma,kyledrake/puma,eileencodes/puma,puma/puma,zBMNForks/puma,BenV/puma,BenV/puma,looker/puma,unleashed/puma,snow/puma,costi/puma,snow/puma,ngpestelos/puma,rkh/puma,ngpestelos/puma,wallclockbuilder/puma,costi/puma,kyledrake/puma,snow/puma,kyledrake/puma,digideskio/puma,digideskio/puma,calavera/puma,kyledrake/puma,zBMNForks/puma,BenV/puma,rkh/puma,jc00ke/puma,zBMNForks/puma,spastorino/puma,looker/puma,prathamesh-sonpatki/puma,eileencodes/puma,prathamesh-sonpatki/puma,unleashed/puma,tuvistavie/puma,costi/puma,nathansamson/puma,nathansamson/puma,ngpestelos/puma,jbmyid/puma,jc00ke/puma,zBMNForks/puma,arturocadena/puma,matthewd/puma,digideskio/puma,spastorino/puma,matthewd/puma,prathamesh-sonpatki/puma,digideskio/puma,rkh/puma,zapnap/puma,puma/puma,jbmyid/puma,costi/puma,jc00ke/puma,wallclockbuilder/puma,wallclockbuilder/puma,zapnap/puma,eileencodes/puma,arturocadena/puma,tuvistavie/puma,matthewd/puma,looker/puma,respire/puma,prathamesh-sonpatki/puma,nathansamson/puma,wallclockbuilder/puma,nathansamson/puma,ngpestelos/puma,respire/puma,puma/puma,jc00ke/puma,unleashed/puma,arturocadena/puma,tuvistavie/puma,puma/puma,snow/puma,matthewd/puma,rkh/puma,arturocadena/puma,respire/puma,unleashed/puma,calavera/puma,calavera/puma,jbmyid/puma,respire/puma,zapnap/puma,looker/puma,spastorino/puma,jbmyid/puma