Trailing whitespace cleanup -- :%s/\s\+$//
Merge branch 'master' of github.com:ryersonlibrary/islandora