-pedantic fixes
llvm 3.2 is missing some intrinsics
Merge branch 'master' into nick-sandbox
fixed Makefile