More convenient dep injection.

Just hide the FEATURES global and use a function instead.
Merge pull request #537 from candlepin/dgoodwin/dep-injection-rename

More convenient dep injection.