fix imp naming
Merge remote-tracking branch 'original/master' into pull-request
fix rec added% key collisions
add unit ai
Merge branch 'Deathmax-pull-request' (early part)

Conflicts:
	extract.py
update info.json
pep8 compliance.