fixed breakage from prior commit and added wagon plugin for real this time
a bunch of plugin updates and additions