Updated for recent rails bugs
Merge branch 'master' of github.com:NYULibraries/marli