Fix indentation in Travis CI configuration.
Load phpunit via composer.
Whitespace fixes.
Separate phpunit configurations for CI and local.
Merge branch 'develop'