Updates

All of this *should* pass the bot okay. There are no conflicts that will prevent a merge, and the changes are relatively simple, so hopefully all will go okay.

----

*Personal Addendum*
Had to create a new PR. I keep screwing myself over by not properly setting up my new local environment using Yosemite against git's CL tools, which has meant editing & pushing commits online and having no easy way to rebase them when required. 

Git's CL element seems to be fully functional against 10.10, so I'll be taking a little time out to re-familiarise myself with that before submitting any more major/large PRs, and hopefully in doing so will be able to be more flexible in reacting to the team's requests here.