Merge pull request #15 from MorganDawe/7.x.merge_fix

7.x.merge fix
Merge pull request #16 from MorganDawe/7.x.merge_fix

Coder violation fixes.
Merge branch '7.x' of https://github.com/discoverygarden/islandora_markup_editor into 7.x.EMIC-130