Fixes #526, #525, #522, #520, #519, #518, #516, #513, #480
merge of updated master into branch to produce merge-ability
lets make travis happy.  If he keeps complaining we are going to tell his friend Jenkins
removal of index h2 away from skeleton, placement of psuedo selectors on separate line
Merge pull request #529 from Connexions/psychology-bugfixes3

Bugfixes for Psychology - 2nd changeset