[ci-skip] added @jrgifford to the broke build list.
fixed .travis.yml conflict
Revert "update rails due to the two CVEs"

This reverts commit 72af831087cd1a6aca065047d048eadccd369476.
Rolled back @steveklabnik's commit, updated rails, ran specs. YAY SECURITY UPDATES! :metal: