Avoid unwanted extra spaces in string literal
Merge pull request #168 from merwok/patch-1

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

text is auto generated from the arguments help text

ref. #166
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'