oops, broke travis
Merge branch 'master' of github.com:dymk/temple