Initial upstream merge, still have to work out a few things
Update all new plugins to use plugins/ dir instead of modules/