Tweaks before refactoring
Removing @property sillyness
Almost finished refactoring config settings.  Much cleaner now. #20