Consolidate changes

[philcali]

While "branch to feature" is idiomatic git workflow, it's becoming increasing clear that Moodle core will not accept these changes individually. Moving from v2.2.3 to v2.3.1 was the straw that broke the camel's back for me.

Unless I'm given a good reason (or motivation) to keep these changes in separate branches I'm going to merge them all up, and blow them away after they are all v2.3.1 ready. This will make moving from minor / major release of Moodle less painful, and probably less confusing for others who want to take advantage of our changes.