Merging changes made from master since the forking of sufia
fixing cucumber to run without ending error by removing row count in find all
Merge branch 'sufia' of github.com:psu-stewardship/scholarsphere into sufia