Merge pull request #137 from alco/travis-pandoc

Enable pandoc tests on Travis
Fix pandoc tests