Removed trailing whitespace
Only target php files for codesniffer
Merge branch 'master' into simpletests

Conflicts:
	.travis.yml