Whitespace Clean Up and Config File Argument

* Clean-up some whitespace issues so that future commits are easier :)
* Add the ability to specify the config file with "-c"