Merge pull request #2 from seantaylor/2-1-lav

Spree Preference for expiration date
Merge pull request #3 from seantaylor/2-1-lav

update default_expiration_date to be more readable
Merge remote-tracking branch 'upstream/2-1-lav' into 2-1-lav