clearing up some pipeline confusion
Merge branch 'master' of https://github.com/johanneshilden/trombone2