added percent terms to creator and mhouse terms to subject
fixing conflict in subject
Merge branch 'master' of https://github.com/OregonDigital/opaque_ns
adding flore terms to people and creator
fixing syntax in urls, removed merge marker
Merge pull request #95 from lsat12357/master

add percent creators, mhouse subjects, flore peeps and creators