Cleanup continues
Merge branch 'master' of github.com:novohispano/store_engine