Merge branch 'ck44' of https://github.com/errantzebra845/slim_candykat_frameworks_base into ck44