prediction modeling more
prediction modeling more
Merge branch 'master' into varoquaux

Conflicts:
	paper.tex