Refactoring to support updated b8framework.
Merge branch 'master' of github.com:Block8/PHPCI