Merge remote-tracking branch 'remotes/scalanlp/master' into TuplePimper

Conflicts:
	src/main/scala/breeze/linalg/package.scala
Merge branch 'TuplePimper' of https://github.com/ktakagaki/breeze

Conflicts:
	src/main/scala/breeze/linalg/package.scala