Updated directed prop time code
Merge branch 'master' of https://github.com/warnberg/proptime

Conflicts:
	directed_prop_time.py