add a note about the LLVM / GCC problems on Ubuntu 14.04 and also
a note explaining our two branches