Updates
Updates
NO CHANGE

Deleted whitespace
NO CHANGE
Merged Config Files

cleaned up code for merged config file. This update decreases file size
and increases performance.