Better mechanism for darwin core terms shortcuts.
Fixed (stupid, Dropbox-induced) conflict.