Remove noconflict (unused, probably not necessary).
merge
Merge branch 'master' of ssh://github.com/commoncode/cqrs
Merge branch 'master' of ssh://github.com/commoncode/cqrs