tavern updates
Merge pull request #1 from devoncarew/master

tavern updates