Spree 2.0 support - updated

Grab @jdutil 's changes plus a couple more to get a clean spec run without deprecation warnings.  In addition to @jdutil 's changes this PR includes:

1. Locking to a stable version of database_cleaner
2. Replacing the now deprecated Order#add_variant method in specs with Order#contents.add