Not sure how to deal with these
Merge branch 'unstable' of github.com:garrettoreilly/CharliePlugins into unstable

Conflicts:
	build/built-jar.properties
Merge branch 'unstable' of github.com:garrettoreilly/CharliePlugins into unstable