changed the php version to 5.5beta2.  Still using all the php build options from 5.4.13
Merge branch 'php55' of https://github.com/triplepoint/web_development_vm_how_to into php55

Conflicts:
	makefile