Changes for yasnippet and python mode