disableReturn flag also disables return when holding shift, or alt

Fixes #114

I haven't written any tests for this as I didn't see any integration tests for similar behaviour, though I'd be happy to write tests if you point me the direction of any integration tests that test related behaviour.