consolidate changes from chef

@mustpax @neilfulwiler 

this will be the only copy of this file now