Commits

  1. merge upstream

    8a8a7bafa037·James Cox <james@imaj.es>·

  2. misc useful

    1f05826afb13·James Cox <james@imaj.es>·

  3. tidy up history

    556ee4198f26·James Cox <james@imaj.es>·