Fix whitespace in Gruntfile
fix gruntfile to watch vendor JS
#206, default margins improved on open water chart
Merge dev into fix_graphic_margins.