Fix an old, long-standing typo!
Be a bit more consistent about when we try to inject the framework.
Merge pull request #184 from seancorfield/develop

Fix old typo; be more consistent about injecting the framework