Add ES mapping
Add shingle filter
Merge branch 'es-rake-tasks'