big update of erb templates after running tests
Merge pull request #5 from oreillymedia/sarah

big update of erb templates