Clean Up
BlackCMS Base
Some config solutions
Minor additions
Merge branch '1.0'