refactoring and remaining bugfixes for psychology
merge of present master branch to eliminate conflicts and produce merge-able branch
Merge pull request #472 from Connexions/psychology-refactor-bugfixes2

Refactoring and remaining bugfixes for Psychology