Added the testflags flag
Merge branch 'master' of github.com:dancannon/goconvey

Conflicts:
	goconvey.go