Make '--unified' the default and add '--no-unified'

As discussed in https://github.com/plock/plock/issues/15