Changed the way Database switching is done. I've just made it a before filter rather than using the Elevator provided by the gem.