Merge branch 'master' of github.com:fwk/Events

Conflicts:
	.travis.yml

added better travis/scrutinizer config (+ hhvm tests)