use double-underscore for temporary variable, as encouraged elsewhere in this file
making html_tile a unicode string to prevent errors in Sphinx
making html_title a unicode string to prevent errors in Sphinx
Merge branch 'master' of github.com:andrewmacgregor/python-guide
fixed community ref pointed to by intro/duction
adding a valid label for installation.rst to ref to
fix minor white space issue causing warning
looks like a typo, was perhaps meant to be link to decorators but that is only a few lines later
using anonymous hyperlinks to avoid duplicate explicit name warnings
see: http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#anonymous-hyperlinks
Conventions header was throwing inconsistent level warning. Fixed this and later headings to match rest of page.
provide valid link for YAGNI
death to curly quotes!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/conf.py
Info about the Salt stack
Merge pull request #209 from tlatsas/master

Salt stack
Small text fix. It's "its" not "it's" here.
Fix a tiny typo
Update link to latest windows python version
Update docs/starting/which-python.rst
Update docs/dev/env.rst

.vimrc file: added 'autoindent'; added comments to illustrate.