Added humidity to Weather plugin
Fixed merge error