test conditional phases
Merge branch 'develop' of http://github.com/mjcdiggity/testing-cookbook into develop