Moving things to jmervine from rubyops