Merge branch 'master' into documentation
Added sphinx-apidoc-generated documentation
Fix pin compile error

Due to PGF v3?
Merge branch 'documentation'
Improved setup.py, for PyPI
Bump version to 0.11.0
Fix: include templates in source distribution

Thanks to Niek for finding this and Arne for reporting.  Fixes #7.
Bump to version 0.12.0
allow multi label list
allow multi label
Merge remote-tracking branch 'upstream/master'

Conflicts:
	artist/templates/subplot.tex