Pull in application from railsrumble/r13-team-525