next batch of overrides
Merge pull request #5 from oreillymedia/sarah

next batch of overrides