Cleaner templating

This style of templating has the same effect as before, but its a bit
easier to read.
Modernize template variables
Merge pull request #5 from xaque208/rubyclean

Cleaner templating