Merge branch 'master' into simd-cleanup

Conflicts:
	basis/math/vectors/simd/functor/functor.factor

diff --cc basis/compiler/cfg/instructions/instructions.factor
Simple merge

diff --cc basis/compiler/tree/propagation/known-words/known-words.factor
Simple merge

diff --cc basis/cpu/architecture/architecture.factor
Simple merge

diff --cc basis/cpu/x86/x86.factor
Simple merge