merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowWorkspace@74361 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '12e701b2205b35901978cc58f033123a990e4f18' into trunk
merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowWorkspace@74408 bc3139a8-67e5-0310-9ffc-ced21a209358
add .BBSoptions file
Merge commit 'e2cef08461d21c8f78cda229921cd34bf6690ff7' into trunk