Merge pull request #1133 from jkoelewijn/transferPenalty

Transfer penalty
remove (confusing) unused variable
Test forbidden trip-to-trip transfer