Less bad function plotting. See #316
Discrete scales will preserve the order of levels as they appear in the data by default. See #316
Fix typo affecting subplot_grid. See #302