Toggle conceal and a couple of fixes and adjustments
Merge branch 'master' of https://github.com/joakin/.vim