Pick the Drupal code standard.
Merge branch 'master' of github.com:cafuego/phits

Conflicts:
	.travis.yml