md --> pandoc conversion
Merge branch 'master' of github.com:gatoatigrado/vimap
fix tox build
Merge branch 'master' into ntung-api_1_0