`plot_mask` doesn't combine user-mask and geometrical mask

[richteague]

Currently the function will ignore all other mask parameters (r_min, r_max, etc.) if mask is provided, while other functions (at least average_spectrum) will combine these masks.