Merge remote-tracking branch 'origin/master'

diff --cc docs/index.rst
index 31b6648,325eedd..90cda08
--- 1/docs/index.rst
--- 2/docs/index.rst
+++ b/docs/index.rst
@@@ -6,10 -6,13 +6,13 @@@
  The Hitchhiker's Guide to Python!
  =================================
  
 -Welcome to The Hitchhiker's Guide to Python. **DON'T PANIC!**
 +Welcome to The Hitchhiker's Guide to Python. `DON'T PANIC! <http://www.amazon.com/gp/product/B0043M4ZH0/ref=as_li_ss_tl?ie=UTF8&tag=bookforkind-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=B0043M4ZH0>`_
  
- **This guide is currently under heavy development, and is mostly a skeleton at the moment.**  If you'd like to help, `fork us on GitHub <https://github.com/kennethreitz/python-guide>`_!
+ **This guide is currently under heavy development, and is mostly a skeleton at
+ the moment.**  If you'd like to help, `fork us on GitHub <https://github.com/kennethreitz/python-guide>`_!
  
- This *opinionated* guide exists to provide both novice and expert Python developers a best-practice handbook to the installation, configuration, and usage of Python on a daily basis.
+ This *opinionated* guide exists to provide both novice and expert Python
+ developers a best-practice handbook to the installation, configuration, and
+ usage of Python on a daily basis.
  
  .. include:: contents.rst.inc