Switched modules to use a configuration file instead of requiring a Service Provider.
Merge branch 'develop'