Updates for 2.10
Add rule for block imports
Merge branch 'master' of github.com:scalastyle/scalastyle
Merge remote-tracking branch 'upstream/pr/54'