Adding attributes for sample suppliers created by rake task.  Contacts_date_of_birth and merchant_type are required for creation now.
Fixes for recent spree & spree_auth_devise changes.
Merge branch 'master' of https://github.com/jfields/spree_drop_ship