Made changes and stuff
Merge branch 'unstable' of github.com:garrettoreilly/CharliePlugins into unstable