Code drunk. Merge sober.
Update composer before running the test suite on travis.