changed the php version to 5.5beta2.  Still using all the php build options from 5.4.13
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
removed APC from the makefile and ini file.  APC evidently doesn't build against php 5.5.
reverting the manual instructions to the master version.  I'll retune these once I get the makefile properly building.  No sense in keeping these synced during development.
bumped nginx and php beta versions
revised git dotfiles
Vagrantfile had weird line endings

This was after I changed the .gitattributes file to control line
endings.
bumped php version to 5.5 beta 4
sync merge from master
copied the .gitignore file over from master, since the merge didnt pick it up
fixed new php extension directory for xdebug
merged changes from master
bumped php version to 5.5.0RC1
Bumped php version

Bumped php to 5.5rc3.  Also made the compass install directory more
flexible.
merge from master
Merge branch 'master' into php55
Revert to production-style php source urls.  Bump version to 5.5 release.
removed with-curlwrappers from php config
Update manual instructions to match makefile