Update dependencies

Just keeping things up to date to make sure the Rails 4 stuff goes more smoothly.