Add map with blue hue.
Merging stuff
More merge fix
Fix indenting errors, tweak jshint
Merge master