Merge pull request #8 from Roadmaster/master

A couple of tweaks to our tarmac config.