[DO NOT MERGE] Frt promo work

contains:
https://github.com/bonobos/spree/pull/57
https://github.com/bonobos/spree/pull/68
https://github.com/bonobos/spree/pull/69
https://github.com/bonobos/spree/pull/70
https://github.com/bonobos/spree/pull/71

Going to get this into QA