Switch to the branches we want to test
Merge branch 'master' of github.com:Siyavula/emas.buildout

Conflicts:
	qa.cfg