Only load modules if configured
Merge pull request #1 from pauloconnor/load_modules

Only load modules if configured