add width/heigth PR fix
back port $.jsonP fix from master.  Rebuild grunt files.