Merge branch 'master' of git://github.com/erikcharlebois/factor

diff --cc basis/cairo/ffi/ffi.factor
Simple merge

diff --cc basis/windows/ddk/hid/hid.factor
Simple merge

diff --cc basis/windows/ddk/setupapi/setupapi.factor
Simple merge

diff --cc basis/windows/ddk/winusb/winusb.factor
Simple merge

diff --cc extra/chipmunk/ffi/ffi.factor
Simple merge

diff --cc extra/freetype/freetype.factor
Simple merge

diff --cc extra/libusb/libusb.factor
Simple merge

diff --cc extra/llvm/core/core.factor
Simple merge

diff --cc extra/tokyo/alien/tcrdb/tcrdb.factor
Simple merge

diff --cc extra/tokyo/alien/tcutil/tcutil.factor
Simple merge

diff --cc unmaintained/cryptlib/libcl/libcl.factor
Simple merge

diff --cc unmaintained/pdf/libhpdf/libhpdf.factor
Simple merge