bring master branch up to speed with development branch

@NYULibraries/hydra 
PR updates master branch with latest development branch commits.