formatting and minor code cleanup
Custom data handling
release id be47b90523
detect corrupt configuration files and abort setup

This detection is not foolproof, but should greatly help if a
configuration file is hosed.
Merge remote-tracking branch 'origin/master' into 1.4.6