Upgraded llvm from 3.5 to 3.6 (hopefully fixes travis build)
Merge branch 'master' of https://github.com/daniel-kun/omni