Added INNER JOIN logic.  Needs some more work, but it's a start
Avoid conflicts with #126
Updated join logic for query plans
Use joins slice for FROM and USING clauses on UPDATE and DELETE, respectively
Merge branch 'query-plans'