Fixed uri calls to Bechdel API
DRYed up the methods
Resolve merge conflicts, clean up comments.
Update to current hash style.