Added PHP 5.6 to travis
Added phpunit config file
Merge branch 'master' into phpcs-fixer

Conflicts:
	.travis.yml