Applied PSR1/2 code style (bundled with PhpStorm) formatting changes across project.
Updated travis config to include refactor branch
Merged master