Added python-mode and cleaned up (removed vscommand
Fixed merge