fixes for psychology including figure padding inside notes and equation hiding
Merge pull request #506 from Connexions/psychology-bugfixes2

Bugfixes for Psychology (fixes #478, #479)
merge of updated master into branch to produce merge-ability