updated tests
fixed jade-php and updated jade
1.1.0
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
	test/expected/layout.php