Updates to pipeline-system - merge from master

I've followed the instructions on github to merge my changes -- still a bit like black magic to me - but if i'm not horribly mistaken, i can now request to pull my master instead of the new branch.