Use spree 2.0.x github branch and some minor fixes.