Merge pull request #11 from nubs/master

Update for php 5.4 buildpack.
Update composer.