Upgraded to latest composer.
Fixed problem with PEAR incompatibility.

We want to put the packages directory first in the include list, so we get
the PEAR libraries there instead of the ones installed on the machine.
Updated to match latest version of composer.

I was getting a warning when doing a composer.phar install, about this, so
I ran ./composer.phar update.