nits
Merge branch 'master' of https://github.com/j2blake/orcid-vivo-connector

Conflicts:
	src/edu/cornell/mannlib/orcivo/OrcivoController.java