Fix dependancy issues

Should fix some issues we are having with plugins and such.

QA Plan
-----------
We need to make sure that all the individual commands are still working with the branch, so running `bundle exec <command>` with this branch checked out will be required.