consolidate modules/features

I'm spending some time while at drupalcon to consolidate the 10-12 features in the core module to just a couple, easier to maintain modules.