Allow space for y-axis label

Comment in code says that this was not previously allowed because it resulted in excessive padding.  However, when the tick mark values are long there is insufficient space for them.
Fix positioning problem when xAxisLabelWidth is set

It was calculating the position of the left-most label on the x-axis using axisLabelWidth, not xAxisLabelWidth which is the one that actually determines the width of the element.
update combined script