closes  #675
Merge branch 'master' of github.com:ilastik/ilastik into bxes-csv