move code in from contrib/ in https://github.com/gordon-morehouse/cipollini