Downgrade to Maruku 0.6.0 to fix all the tests
Merge pull request #1598 from mojombo/maruku-0.6.0

Downgrade to Maruku 0.6.0 to fix all the tests
Update history to reflect merge of #1598