Fixed merge conflicts
Added xfails to tests because of page title errors
Fixed merge conflicts
Merge pull request #39 from justinpotts/page_titles_xfail

Xfail failing tests for issue #38