Manual rebase -- allow sigma_clip by axis
Update docstring to conform to astropy standard
Merge pull request #1083 from mhvk/sigma-clip-by-axis

Sigma clip by axis (closes #1037)