take constants from scipy, small fixes
Merge branch 'master' of https://github.com/awbirdsall/popmodel

Conflicts:
	popmodel/application.py