Removed parameter to resample and shuffle, and instead always pass allow_nd=True to check_array. Also, add a test that makes sure shuffle doesn't fail on arrays with ndim > 2.