added a comment
added comments that might help avoid unintended expectations
resolve conflict
temporary fix for locking
Merge pull request #165 from aleeper/groovy-devel

robot interaction locking, and some comments