Much better code™

Better sp states.
Hopefully we can now use several waves in our expansion.
Merge branch 'master' of https://github.com/pnutus/NHQM

Conflicts:
	nhqm/mb_schemes/coupled.py
	scripts/3body.py