Fixed configuration issue with finding armadillo.
Merge branch 'stable'