Updated the makefile so that Travis CI should be able to use GCC.

Should be testing both compilers...