Merge branch 'develop' into mpi_trap
fix spelling and spacing
Merge branch 'mpi_trap' of git://github.com/ayr0/numerical_computing into MPI_Trap