Update lineify, add py3k interator compliance.