adds github plugin and python autocompletion
resolve merge conflicts