Require a word boundary for bees
Merge branch 'master' into bee_boundary

Conflicts:
	src/scripts/bees.coffee
Merge pull request #855 from ivey/bee_boundary

Require a word boundary for bees