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

Conflicts:
	basis/math/matrices/matrices.factor

diff --cc basis/math/matrices/matrices.factor
index 3203355bb935f801e6725f4a048c4b4fefb47192,21d9a97adf04e98959538b135a10266d50f3b1e2..4ba8e1d3d904b99df5cbaa99344bd9462e1bc073
--- 1/basis/math/matrices/matrices.factor
--- 2/basis/math/matrices/matrices.factor
+++ b/basis/math/matrices/matrices.factor
@@@ -136,7 -61,11 +136,7 @@@ PRIVATE
  
  : cross-zip ( seq1 seq2 -- seq1xseq2 )
      [ [ 2array ] with map ] curry map ;
 -
 -<PRIVATE
      
 -: m^n ( m n -- m ) 
 +: m^n ( m n -- n ) 
      make-bits over first length identity-matrix
--    [ [ dupd m. ] when [ dup m. ] dip ] reduce nip ;
 -
 -PRIVATE>
++    [ [ dupd m. ] when [ dup m. ] dip ] reduce nip ;