Removed old armadillo (until my PR is accepted).
Merge branch 'master' of https://github.com/nabijaczleweli/Cpp-CGOL