scoping changes effected by coffee upgrade
Merge pull request #4 from trobrock/coffee-update

scoping changes effected by coffee upgrade