Merge branch 'chaeo_pipeline'

# Conflicts:
#	.gitignore
#	model_server/base/accessors.py
#	model_server/base/api.py
#	model_server/base/models.py
#	model_server/base/process.py
#	model_server/base/util.py
#	model_server/base/workflows.py
#	model_server/conf/testing.py
#	model_server/extensions/ilastik/conf.py
#	model_server/extensions/ilastik/models.py
#	model_server/extensions/ilastik/router.py
#	model_server/extensions/ilastik/tests/test_ilastik.py
#	model_server/scripts/run_server.py
#	tests/test_accessors.py
#	tests/test_model.py
#	tests/test_process.py
#	tests/test_session.py
#	tests/test_workflow.py