misc
Merge branch 'jonathan'

Conflicts:
	lfd/registration.py
stuff
merge john