Cleaning up loading callbacks in bookmarklet.
per https://github.com/openannotation/annotator/issues/425
Changing test to check parentElement instead of parentNode.
per https://github.com/openannotation/annotator/issues/426
Merge branch 'master' into grunt-test