Makefile and requirements
Updated travis with new make targets