tapted/tavern — pull request #2 by keertip (2014-03-19 15:42:18+00:00)
Title: move changes from bleeding edge to tavern

@devoncarew @taped