Implement all callbacks except for units_seen.
Merge branch 'develop' into feature-callbacks

Conflicts:
	unit.py