Merge `greduan` branch into `master`

I don't really need confirmation to do this, but it's nice to ask for permission, in case I seriously messed anything up.

If you could check for any grammar problems and such, @hal-gh that would be nice. And @balupton If you could check for incorrect info that would be great. :)