- Made it compile again with gcc (4.8.2)
- Reworked the makefile test to try both clang and gcc at the same time