upgrade to Spree 2.4 branch + minor setup tweaks