Fixes to annotation, and can now load images directly from wikipedia api rather than freebase