Pull in revised cf-core & remove cf-enhancements less that was added to cf-core.
Merge upstream
Merge pull request #194 from virginiacc/gh-pages

Update cf-core
Fixes merge conflict.