Replace list comprehension with dict lookup

Improves import time
Bump version to 0.2.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	iso639/iso639.py
Python 2.6 support for test cases