Separated classes, parser now accepts raw page content
Merge branch 'master' of https://github.com/wikiviz/wikiviz