mm program with either mkl, omp, plain, or MPI computation paths
Merge with parent branch
Contact info
Merge branch 'master' of https://github.com/afmorrison/SICM2-Software-Summer-School-2014 into afmorrison-master
Moved mm file around and fixed conflicts
Merge branch 'afmorrison-master'

Cleaned up conflicts.