May's Update

Merge in the latest changes relating to the issues listed here:
https://github.com/HumanDynamics/openPDS-RegistryServer/issues