Removing elasticsearch as a service from travis.yml, as it is loaded manually
Merge branch 'master' of github.com:instedd/resourcemap

# By Valeria Tiffenberg
# Via Valeria Tiffenberg
* 'master' of github.com:instedd/resourcemap:
  Fix #797 Collections step in breadcrumb could not be clicked when editing a site