More changes to make this work with the new omnibus
Merge pull request #3 from intuit/more_updates

More changes to make this work with the new omnibus