Merge from christopherbauer/ContextualDates

Still getting used to all this.