Update Vundle interface, pymode edits.
Fix merge issue