Remove unnecessary parser abstraction
Merge branch 'dev'

Conflicts:
	lib/docx/document.rb
	lib/docx/parser.rb
Added paragraph alignment and font size recognition
basic to_html implemenation
sturdier html tests
Merge branch 'master' of https://github.com/higginsdragon/docx into higgins-merge

Conflicts:
	lib/docx/document.rb
	lib/docx/parser.rb
	spec/docx/document_spec.rb
Fix Zip::File
Fix syntax
Missed this in merge