Merge pull request #951 from Cadair/master

[Review]: Fix formatting in CHANGELOG
Wrong bracket around sine?
PEP 8 and more idiomatic code in image/tests/test_resample.py

Use spaces instead of tabs and also use ``is None`` or ``is not None``
instead of ``== None`` or ``!= None``, respectively.
Merge pull request #966 from derdon/test_resample

[BugFix]: PEP 8 and more idiomatic code in image/tests/test_resample.py
renamed chaincode_test.py to test_chaincode.py

This is required so that py.test detects this file automatically as a
test file and execute its test functions.
Merge pull request #978 from derdon/chaincode-test

renamed chaincode_test.py to test_chaincode.py
Merge pull request #961 from freekv/patch-1

MRG: Wrong bracket around sine?
Add changelog entry for PR #961
Update README.md