don't mention intervals twice when parsing data bags
Merge branch 'ben.v4' into jtimberman/v4