Conflict between pymode folding and vim diff - #602

Conflict between pymode folding and vim diff#602

fartashf wants to merge 15 commits into

python-mode:developpython-mode/python-mode:developfrom

fartashf:developfartashf/python-mode:developCopy head branch name to clipboard