Makefile change to more reliably find the right llvm include dir
Merge branch 'master' into nick-sandbox