Updating gemfile
Throwing out gemfile.lock prior to merging in develop.
Revert "Throwing out gemfile.lock prior to merging in develop."

This reverts commit 3bba8a34d7715238f9e9419216261004a51745b7.
Gemfile update
Merge branch 'develop'
Updating call for gssapi Gem and bumping the version.
change the name of the object rights option "None" to "Citation Only"
Updating the testing cap deploy to actually use RAILS_ENV=testing