Updates to make plugin compatible with Omeka 2.0.
Merging with 2.0 branch