Merge pull request #74 from sadielbartholomew/assorted-fixes-from-test-suite

Assorted bug fixes with plotting variable defaults consolidation

Author: sadielbartholomew