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

Conflicts:
	src/main/scala/breeze/linalg/package.scala
Merge branch 'TuplePimper' into signal

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