Merge pull request #15 from mjcdiggity/feature/testbuilder

Snagglepuss
test conditional phases
Merge branch 'develop' of http://github.com/mjcdiggity/testing-cookbook into develop
push push
Merge pull request #16 from mjcdiggity/feature/testbuilder

deploy conditional
Merge pull request #17 from mjcdiggity/feature/testbuilder

zubizubi
Merge pull request #18 from mjcdiggity/feature/testbuilder

bananafish
Merge branch 'develop' into feature/groovy-script-update
Changes to groovy script