Updated bootstrap as per changes to composer.
Updated Makefile
Updated travis.yml