ElasticSearch mappings

Please review the changes before merging into master and creating version 0.2.