Merge pull request #316 from LCSB-BioCore/mk-cleanup-exchange-stuff

clean up exchanges a bit
12 jobs for master in 19 minutes and 57 seconds (queued for 2 seconds)