Bundle update to make travis happy and update rspec formats for tests to pass