Merge branch 'master' into version-0.4.0

.gitignore

clients/ITKwatershed.py

clients/ddic-sumTwoDiscretes.py

docs/source/conventions.rst

docs/source/installation.rst

requirements-dev.txt

requirements.txt

scripts/ITKwatershed

scripts/spam-ITKwatershed

scripts/spam-ddic

scripts/spam-discreteStrains

scripts/spam-gdic

scripts/spam-ldic

scripts/spam-mmr-graphical

scripts/spam-moveGrains

setup.py

tests/test_binning.py

tests/test_kalisphera.py

tests/test_scripts.py

tools/DIC/correlate.py