Add PhantomJs tests.
Merge branch 'master' into import-contracts

Conflicts:
	negawatt/drupal-org.make