Use Normal Tabletop instead of fork

Now that https://github.com/jsoma/tabletop/pull/46 and
https://github.com/jsoma/tabletop/pull/48 have been merged, we
can use regular Tabletop instead of my fork.
Merge remote-tracking branch 'origin/master'