From: https://github.com/alex/pystache/commit/b2ae206d68961b8aef568ceaa3dd1274150ef23e
Into: issue_34

Fixed a bug which caused the unit tests related to rendering zeroes to fail
when using PyPy.  Using "is" to compare integers relies on an implementation
of CPython.  The operator "==" should be used instead.

Switched to using optparse from argparse, which is only available
starting in Python 2.7.

From: https://github.com/vrde/pystache/commit/4c22f137697c0a3437a6d867f44e958d6f6969f2
Into: issue_31

Added entry point to setup.py.  Skipped changes related to "partials can be passed
as a dictionary" because that was addressed as part of issue #47.

Conflicts:
	setup.py

From: https://github.com/vrde/pystache/commit/7667a95e285bbf162e2425045999e07b7bfea5f9
Into: issue_31

Adds command-line script: pystache/commands.py

Added test cases to check that View.template_path is respected.

Added a test case to load templates from a dictionary.

Also simplified the Template.load_template() method.

The constructor accepts search_dirs, template_encoding, and template_extension.

Closing issue #29 "Cleanups": https://github.com/defunkt/pystache/pull/29

From: https://github.com/kennethreitz/pystache/commit/6886173ce0694478b31b4e7acdb0bf0368167db2
Into: issue_29

The setup.py module now uses single quotes ("'") for all strings.

Conflicts:
	setup.py

From: https://github.com/kennethreitz/pystache/commit/200ab9c3731a6f9baf8709c107fae0a5984d6b28
Into: issue_29

Adds "Cheeseshop" to the docstring for setup.py's publish() function.

Conflicts:
	setup.py

From: https://github.com/kennethreitz/pystache/commit/43d504b5dbdb043cdfe9a87ffb4b3b239c130ab8
Into: issue_29

This commit includes a few tweaks to setup.py.  The indentation of the
arguments to setup() was left alone.

From: https://github.com/kennethreitz/pystache/commit/5cd2886c622cd88ef2f68ea189a70ae9af3d8637
Into: issue_29

This commit stubs out a few more docstrings.

Conflicts:
	pystache/template.py

From: https://github.com/kennethreitz/pystache/commit/e501ec273df9af0e2fe3e9752b19d0d94cc3884e
Into: issue_29

This commit stubs out docstrings for some methods.

Conflicts:
	pystache/view.py

From: https://github.com/kennethreitz/pystache/commit/20bec630efed85dd0e4eaa751da2af3db7f64f3e
Into: issue_29

This commit makes mostly spacing and docstring tweaks.  Not all changes
from the parent were incorporated into the commit.

Conflicts:
	pystache/template.py
	pystache/view.py

From: https://github.com/kennethreitz/pystache/commit/8ca7408f6948f7a7214897d4a31b0a3aabaf8216
Into: issue_29

Moves code out of __init__.py into its own module.

Changes from the original request:

 * Called the new module init.py instead of core.py.
 * Added a comment inside __init__.py.
 * Used editor-agnostic encoding line.
 * Fixed import line in view.py since nosetests was breaking.