PSR-4 style autoloading and correct default values for configuration.
Merge branch 'master' into fixes