Merge branch 'upstream' into develop
Merge branch 'upstream' into develop
Merge branch 'upstream' into develop
Add configurable title padding

Adds the Chart.titlePadding, and hooks it in to margin calculations.

We already had a test for chart titles, using the hardcoded "20" value,
so I hijacked this test and updated to use the new API.

Also updates the changelog
Remove leftover variable

Forgot to remove the hard-coded (no longer used) value.
Merge pull request #226 from tpkelly/develop

Title padding