Fix --with-tox failure due to spurious trailing comma
Merge pull request #28 from dangra/fix-tox

Fix --with-tox failure due to spurious trailing comma
Version bump
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	CHANGES.rst