Merge branch 'expansion' into behat

Conflicts:
	flow.plugin.zsh
[TASK] Add Package Expansion to Behat Command
Use my username