Testing and minor changes.

- tested results by e.g. plotting stuff.
- rearrangements in DiscreteFunctions.init() to make it easier to
  follow.
Merge remote-tracking branch 'upstream/master' into matt

Conflicts:
	DensitySimulation/Functions.py
changed name of main script.