Get tests passing for Ruby 2.1.1
Merge pull request #799 from projectblacklight/ruby_2_1_1

Get tests passing for Ruby 2.1.1