Changes needed for Minitest 5.0 upgrade
Resolve merge conflicts
Merge branch 'master' into minitest-5.0
Update Gemfile
Fix deprecation warning
Merge pull request #24 from hybridgroup/minitest-5.0

Changes needed for Minitest 5.0 upgrade