Update to latest llvm

Includes previous fixes from pr/153