Minor corrections and testing file.

- some minor corrections.
- added a testing file.
Merge remote-tracking branch 'upstream/master' into matt

Conflicts:
	DensitySimulation/Functions.py

Manual merging.
Merge pull request #5 from PellelNitram/master

08212014 first corrections