Updates for Spree 2.0 & Making RSpec actually run.