more time
Merge branch 'cam-and-time' of github.com:cbaggers/cepl into cam-and-time

Conflicts:
	time/conditional-funcs.lisp