Issue53 flow junction

This reverts the temporary change that is no longer needed with Dymola 2015 FD01.
This closes #53