Fix merge conflicts

You only need the last two changelists which fix references to xAxis.property instead of xAxis().property. The other changes come from the version0.5 branch which was pulled into my refactor branch and then merged with master, which is where this pull request comes from. It should all be changes you either wrote or already pulled.