py.test
test import from future fix
Merge branch 'master' of github.com:mrkrd/thorns

Conflicts:
	tests/test_map.py