Staves in the same system are not tied together

In v1.7: ![pte_17](https://cloud.githubusercontent.com/assets/303951/3652332/cae9bdcc-1138-11e4-9fc7-cb2215cf853c.png)

Currently: ![pte_20](https://cloud.githubusercontent.com/assets/303951/3652333/ce966d8a-1138-11e4-8617-46ef43845671.png)
