Update Maven shade plugin to 2.1 and minor cleanup.