Fixed Makefile for travis
Merge branch 'master' of github.com:flowlo/pcp-vns