Added Armadillo patch to disable HDF5 when downloaded and compiled. Solves problem with Anaconda Python
Fixed git conflict.