Cleanup stage 1
Merge branch 'master' into api-upgrade

Conflicts:
	lib/phpunit.coffee
Fix deprecations #10
Fix runOnSave