fix for change to Dict constructor in 0.4
fix conflict
Merge branch 'master' of git://github.com/jverzani/Mustache.jl