Table branch
Merging tables branch
Revert "Merging tables branch"

This reverts commit 9855b108b6b2f03f8accd64c768ca8a308df8217, reversing
changes made to 707cef854e43573aa05f60b47370d20e08fd580f.
Include table plugin in build