Implemented a config validator that can be run standalone or as part of configure.py, added an invalid config file for testing the validator
Fixed merge conflict