Merge of Scholarsphere changes on master  since sufia fork

Changes made onthe master Scholarsphere branch merged into the local sufia gem.
A pull was made from master in SS and then was updated to work within the sufia gem.