Style cleanup.
Add template for the kivy python-framework to README.rst
Avoid unwanted extra spaces in string literal
Style cleanup.
fixes python 2.6 compatibility
add documentation about command line arguments

text is auto generated from the arguments help text

ref. #166
Merge branch 'feature/context-hooks' into work

* feature/context-hooks:
  fixes python 2.6 compatibility
  Style cleanup.
  Avoid unwanted extra spaces in string literal
Merge pull request #171 from hackebrot/master

Add template for the kivy python-framework to README.rst
updates 2.6 requirements to fix issue #174.

 simplejson > 2.1
Merge branch 'feature/Document-the-command-line-options' of git://github.com/saxix/cookiecutter into saxix-feature/Document-the-command-line-options
Merge branch 'saxix-feature/Document-the-command-line-options'
Add troubleshooting info about Python 3.3 tests and Tox.
Merge branch 'feature/issue-174' of git://github.com/saxix/cookiecutter into saxix-feature/issue-174
Merge branch 'saxix-feature/issue-174'
Merge branch 'develop' into work

* develop:
  Add troubleshooting info about Python 3.3 tests and Tox.
  updates 2.6 requirements to fix issue #174.
  add documentation about command line arguments
  Add template for the kivy python-framework to README.rst
  Style cleanup.