Move around some stuff.
Merge branch 'master' of github.com:N3X15/packaging

Conflicts:
	hhvm-build