local hacks
resolve conflicts
parameter conflict
i don't know.

Merge branch 'master' of https://github.com/johngergely/conductor
tryna update
Merge branch 'master' of https://github.com/johngergely/conductor

Conflicts:
	plotComposer.py