Feature/external config

Need this merged before I can put in the refactoring for proper packaging.