Promotional features

Tracker: https://www.pivotaltracker.com/story/show/46261745

Some tweaks for promotional features, based on feedback from Pete and Ross. Enough changes to warrant a fresh pull request.