Trusty tahr support, plus bundler and some tidying