Added a note about `SuperTab` in VIM section
Add backticks to inline code 

Single backticks were used in places, which doesn't seem to render as code (at least on Firefox).  Line 137 has a code statement within ** ** that isn't rendering correctly, but I'm not sure how to fix it.
Merge pull request #425 from schodge/patch-1

Add backticks to inline code
Strip trailing whitespace.
Fix a few minor typos.

Standardize on "command line", not "command-line".
backslashes escaping windows directories
fix nested markup, literal doesn't work

Inline markup can't be nested, see http://docutils.sourceforge.net/docs/user/rst/quickref.html#inline-markup, last sentence.
Merge pull request #428 from schodge/patch-2

fix nested markup, literal doesn't work
minor grammar fix: "An useful" -> "A useful"
Merge pull request #430 from taleinat/master

minor grammar fix: "An useful" -> "A useful"
Merge pull request #427 from gerbal/master

backslashes escaping broke windows directory names
Rename "command line" to "command-line".
Merge pull request #426 from Locker537/cli_fixes

Minor improvements to 'Command Line Applications' docs
Update description of scientific Python distributions

- The business model of Anaconda has changed slightly: now it's a free product with 'add-ons' that cost money.
- Enthought has largely replaced EPD with Canopy.
- I've moved Anaconda before Canopy: this is obviously subjective, but Anaconda includes a lot more for free (Canopy Express excludes many open source packages). Workshops like Software Carpentry now tend to point new users to Anaconda for installation.
Fix typo in scrape.rst
Merge pull request #432 from mhlakhani/master

Fix typo in scrape.rst
Merge pull request #431 from takluyver/patch-1

Update description of scientific Python distributions
Fixed minor typos in writing/style
Merge pull request #434 from dbbrian/master

Fixed minor typos in writing/style
Grammar fixed as indicated in issue #429.