Re-working how behat.yml files are stored and committed.