Wrote a function that reads a universe of bodies from a simple ASCII file.
Minor variable/type renames.
Merge branch 'thenriod' of github.com:JordanBlocher/openmpi into thenriod

Conflicts:
	nbody/src/nbody.cpp
Merge branch 'master' into thenriod

Conflicts:
	nbody/src/nbody.cpp
Merge branch 'thenriod' of github.com:JordanBlocher/openmpi into thenriod

Conflicts:
	nbody/src/nbody.cpp