Removed old code
Removed cruft.
Merge branch 'develop'

Conflicts:
	ngm_discrete.py