Correctly disabling the reset button initially and removing some variables that are duplicates of other variables
Merge remote-tracking branch 'upstream/master' into jp751
Fixed a table bug I introduced in a previous PR
Merge remote-tracking branch 'upstream/master' into jp751
Merge pull request #867 from jaypoulz/jp751

Zoom should now resize appropriately when not locked by the user.