file extension
Merge branch 'master' of github.com:neumark/geopez

Conflicts:
	geopez.py
Merge branch 'master' of github.com:neumark/geopez
Moving files