Merge pull request bolt#413 from bolt/hotfix/bump-version-to-alpha-3

Bump version to 4.0.0-alpha.3

Merge pull request bolt#260 from bolt/minor-taxonomy-fixes

Minor fixes and cleanup for taxonomies