up geoff importer version, up version
Merge branch 'master' of github.com:shutl/geoff

Conflicts:
	Gemfile.lock