Update travis configuraiton
Updating Makefile, Vagrantfile