Added a few functions
Merge branch 'master' of github.com:jdahm/xflow_python_utils

Conflicts:
	adaptation.py