Add all custom plugins for now, may remove them later
Merge remote-tracking branch 'origin/master'