Revise order of vim-arpeggio
Merge branch 'master' into mac