Bump minor version to 0.2.0
Merge remote-tracking branch 'origin/plugins' into plugins

Conflicts:
	package.json