Minor fixes
Bump to 0.2.1
Merge branch 'dev'

Conflicts:
	docs/conf.py
	infocards/_version.py
	setup.py