tweak to complile with LLVM 3.1
Merge branch 'perf' into develop
ran OSX tests