Merge changes from johannes' elli_template

Basically add all the changes from johannes version, but keeping the README in for newbies (a.k.a me)