First pass after upgrading to rails 4
Added minitest/reporters to test_helper to get RubyMine to work
Removed some deprecation warnings