renamed plugin names for correct ordering on install
Merge remote-tracking branch 'origin/master'