install codeception for travis-ci
Merge branches 'master' and 'master' of https://github.com/phundament/app

Conflicts:
	.travis.yml