Fixes for the test suite

Currently, the test suite won't pass on certain machines or Travis.

This fixes it so it will, and updates the Gemfile dependancies.

@rodjek you mind having a looksie?