Still have a bug with the map not being defined when we want to apply/draw the heat map onto it.
Merge branch 'branch_for_merging_heatmap_and_data' of https://github.com/QuasimodoNZ/Hackfest2014 into branch_for_merging_heatmap_and_data

Conflicts:
	Controllers/script.js
Fixing for the data update (with the array, within an array, within an array)