Merge pull request #1 from tomstockton/master

Update depracated syntax in templates.
Fix ignorant usage of erb.