Updated according to the latest changes in HHVM

Fixes #12
Fixes #13
Fixes #14
Sync with facebook/hhvm@0725be7
Merge pull request #15 from whatthejeff/patch-1

Sync with facebook/hhvm@0725be7
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Sync with facebook/hhvm@0725be7
  Updated according to the latest changes in HHVM

Conflicts:
	Vagrantfile