Merge branch 'master' of https://github.com/Data2Semantics/linkitup
Revert "Merge branch 'master' of https://github.com/Data2Semantics/linkitup"

This reverts commit 2ccbd84518bbe2e37bc799aceae2ad7f40426d31, reversing
changes made to 3f0f15aabb702732adfa30e37745ee901e2b418e.
Update image url
Break authentication if the OID response does not contain an email
Tabs to spaces
Merge branch 'setuptools'

Conflicts:
	.gitignore
	src/setup.py
Merge 'recover', clean the mess left by an accidental merge
Override default figshare callback when the server name is known
Merge -s ours branch 'master' into recover