Merge branch 'master' into 'development': after releasing v0.5.0 to PyPI

Conflicts:
	pystache/init.py
	setup.py

pystache/init.py

@@ -11,7 +11,7 @@ from pystache.template_spec import TemplateSpec
 
 __all__ = ['__version__', 'render', 'Renderer', 'TemplateSpec']
 
-__version__ = '0.5.0-rc'  # Also change in setup.py.
+__version__ = '0.5.1-alpha'  # Also change in setup.py.
 
 def render(template, context=None, **kwargs):
     """

setup.py

@@ -54,7 +54,7 @@ else:
 # TODO: use the logging module instead of printing.
 print("Using: version %s of %s" % (repr(dist.__version__), repr(dist)))
 
-VERSION = '0.5.0-rc'  # Also change in pystache/init.py.
+VERSION = '0.5.1-alpha'  # Also change in pystache/init.py.
 
 
 def publish():
@@ -127,7 +127,7 @@ PACKAGES = [
 
 
 setup(name='pystache',
-      version='0.5.0-rc',
+      version=VERSION,
       license='MIT',
       description='Mustache for Python',
       long_description=long_description,