updated to support new gems, removed webrat