Merge branch 'wr/multi-goal' into wr/v0.3.0

# Conflicts:
#	src/goal-plugin.js
#	test/goal-plugin.test.js