include tailor, strainer

and some tiny changes to make tailor happy
TODO: fix Chefspec failures