Merge pull request #37 from marioBonales/master

Fixed wrong or missing commits in vim-matchit and vim-jst
Removed showmarks plugin