Fix travis failures#56

eileencodes merged 4 commits intorails:masterrails/rails-controller-testing:masterfrom

eileencodes:fix-travis-failureseileencodes/rails-controller-testing:fix-travis-failuresCopy head branch name to clipboard