resolved issued with Butterfly running on local file system
cleaned up inchworm script
Merge branch 'trinity'

Conflicts:
	mods/trinity_butterfly.sh
smokebox updated
Bugfix cleanup
Merge remote-tracking branch 'gurado/master'