* upstream/master:
  Fix typo in README.md (#252)
  Disable linter without workspaces (#241)

* upstream/master:
  Fix feedback service (#246)
  Fix django context initializer (#248)
  disable generation of tags file upon extension load (#264)

* upstream/master:
  Resolve pythonPath before comparing it to shebang (#273)

* upstream/master:
  Fixes #22 to Detect anaconda from known locations  (#221)
  Use workspaceFolder token instead of workspaceRoot (#267)
  Fix registry lookup response (#224)
  Fix issues when running without debugging and debugged code terminates (#249)

* upstream/master:
  Fix debugging tests (#304)

* upstream/master:
  Remove jupyter functionality in favor of Jupyter extension (#302)
  Drop Python 2 URLs (#307)

* upstream/master:
  Remove setting python.formatting.formatOnSave in favor of the vs code setting (#312)

* upstream/master:
  Remove setting linting.lintOnTextChange as it was never implemented (#315)

* upstream/master:
  Fix travis build error (#326)

* upstream/master:
  add new npm deps with improved gulp for dev (#328)

* upstream/master:
  Update version of inversify package (#329)

* upstream/master:
  Document our dev process (#330)

* upstream/master:
  Document contribution to the code along with coding standards (#321)

* upstream/master:
  Add Simplified Chinese translation of commands (#240)

* upstream/master:
  Fix package.json (#347)

* upstream/master:
  #34, #110 - suppress Intellisense in strings and comments (#339)
  Re-factor code python execution framework  (#345)

* upstream/master:
  Fix linters to make use of the new python code execution framework (#360)
  Update the versioning scheme (#356)
  Make npm happy in regards to line endings (#357)

* upstream/master:
  Ensure python path is not set if already set in user settings (#369)
  Use 'an' rather than 'a' before vowel words (#373)

* upstream/master:
  Use new environment variable parser (#362)