remving cruft
fixing elastic search template
adding tokens support