Cleanup FeatureContext
Merge branch 'master' of github.com:nlisgo/elife-kickstart