Make '--unified' the default and add '--no-unified'
Merge pull request #16 from href/master

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