Merge pull request #389 from edx/master

Tags applied to features are inherited by scenarios
Add more tests for tagging