Update requirements to maruku 0.7
Remove extraneous newlines from XHTML output
Fix tests to expect maruku 0.7 output
Merge pull request #1775 from Ivoz/maruku

Update to maruku 0.7