Fixed travis & typed attack
Merge branch 'script_dev' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into script_dev
Fixed Makefile again