Update modules loaded by default. Set more optional modules to optional.
Merge pull request #614 from cosmoharrigan/conf

Update modules loaded by default. Set more optional modules to optional.