Merge branch 'plugin_work' into rax_plugin
remove rax stuff for proposal
code cleanup
code cleanup
merge with mainline
Removing packages and items from vendor that shouldn't be in just yet.