Work Queue 4.0 and NumPy 1.7 fixes
Merge branch 'master' of github.com:leeping/forcebalance

Conflicts:
	src/molecule.py