Updates to allow this recipe to work.
Merge pull request #2 from posulliv/small-fixes

Fixes merge conflict junk. Updates apache site conf template.