Merge pull request #1078 from InfinitiesLoop/dev

Configurable ContentProviders
Cleanup some of the startup logic
Reload content providers after saving admin