removed python ftplugin
finishing merge...