Merge branch 'master' into feature/tile_map
adding makeLabel labels to tile_map tooltip for value counts, averages, etc.
Merge branch 'feature/tilemap' of https://github.com/jthomassie/kibana into feature/tile_map

Conflicts:
	src/kibana/plugins/vis_types/converters/tile_map.js
removing index from arguments
adding makeLabel values to labels in tile map tooltip