First pass at adding support for Behat.
Merge remote branch 'origin/behat' into distro-take-1