Closes #303 - moved 'catodatastore' into this repo.  (Also fixed pep8 warnings)
Merge branch 'enhancement/303'