Remove pymode folding
Add python_fold plugin (with a few modifications)

http://www.vim.org/scripts/script.php?script_id=515
Use python_fold instead of pymode#folding