Squashed commits from code review.

Squashed commits of the following:

commit 9eaf2e2aa89788b408aec3a735941d86579f7c18
Author: Moshe Bildner <moshe.bildner@gmail.com>
Date:   Sat Jun 21 16:57:59 2014 -0400

    revert changes accidentally included from code review.

commit 191665435c1054a7b65008b5a52114c439a76aae
Author: Mary Rose Cook <maryrosecook@maryrosecook.com>
Date:   Thu Jun 19 12:36:34 2014 -0400

    Make main injector() pass along context, if supplied

    Tabs to spaces

    * Sorry - should have done this earlier.

    This line is redundant