Merge branch 'devel' of github.com:gabeos/breeze into gabeos-devel

Conflicts:
	math/src/main/scala/breeze/linalg/SparseVector.scala
Merged from upstream/master