Merge branch 'master' into steve
Merge branch 'master' into steve
adding custom synonym matching to build_journal_synonyms2
missing file
http issue with microformats