Added image sampling tests
Fixed typos in testing docs
Combined downsample and upsample in sampling.pyx
Fixed downsample imports
Merge pull request #76 from larrybradley/sampling-tests

Added image sampling tests
Mark tests that require scikit-image
Merge pull request #78 from cdeil/skimage_skip_tests

Mark tests that require scikit-image
Fixed a test in test_core