:punch: Refactored base code - Cleaned way up
:punch: updated to remove cache
Merge branch 'master' of github.com:jbueler/JBCoreDataAgent

* 'master' of github.com:jbueler/JBCoreDataAgent:
  Tmp file to store some refactoring