Making test OS agnostic.
Bumping version number.
Merge branch 'master' into development

Conflicts:
	pystache/__init__.py
	setup.py