Pulling in new VIVO commits.
Merge branch 'master' of https://github.com/Brown-University-Library/vivo
Merge branch 'dev'
Merge branch 'master' of https://github.com/Brown-University-Library/vivo
Template moves.