Fixed up some merge errors that killed compile. Added hard coded mode

Now you can set a flag to have it read parameters from Params.h instead of trying to use EEPROM. This should be easier during testing.

Also fixed some spots were the merge went wonky and wrong code was left behind. It compiles now.

Lastly, some cosmetic fix up where lines were reformatted to use tabs and be properly indented.