changes for vassar
merged conflicts
Merge branch '6.x' of git://github.com/nhart/islandora_solution_pack_book