Added VAMDC plugin
Merge remote-tracking branch 'origin/astronomy' into astronomy

Conflicts:
	pom.xml