fixed bugs in entries made to database; cleaned up stuff
Merge branch 'master' of https://github.com/cpausmit/IntelROCCS