Changed back to new conference gem on ruby gems

And fixed problem when bundling because rails-4 branch
of rails admin