added mustache mode and misc other settings
merge
merge