Fixed the error in the GUPS plan
Manually merged Josh's pull request. All the performance functionality
is now optional, disable via a command line option.
merging changes from jdlschrock
fixing errors
* reformat all source files with uncrustify
* add uncrustify.cfg