Merge in https://github.com/TiarnanRedmond/autotorrent/pull/1/files
Merge in https://github.com/TiarnanRedmond/autotorrent/pull/1/files