Merge branch 'v0.4.0-prep' into master (issue #83)

v0.4.0 should now be ready to push to PyPI.

MANIFEST.in

+include LICENSE
 include HISTORY.rst README.rst

setup.py

 #!/usr/bin/env python
+"""
+Run the following to publish to PyPI:
+
+> python setup.py publish
+
+"""
 
 import os
 import sys
@@ -17,7 +23,7 @@ if sys.argv[-1] == "publish":
     sys.exit()
 
 setup(name='pystache',
-      version='0.3.1',
+      version='0.4.0',
       description='Mustache for Python',
       long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
       author='Chris Wanstrath',
@@ -25,7 +31,7 @@ setup(name='pystache',
       url='http://github.com/defunkt/pystache',
       packages=['pystache'],
       license='MIT',
-      classifiers = ( 
+      classifiers = (
         "Development Status :: 4 - Beta",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python",