updated dependency vigra -> vigra-git
Merge remote-tracking branch 'funkey/master' into catmaid

Conflicts:
	CMakeLists.txt