Change mapping of snipmate, to avoid collisions with jedi-vim
Updated docs
Merge branch 'fix-problem-jedi-and-snipmate' into develop