Integrating part of cameron's changes
iter
Merge branch 'cameron' into varoquaux

Conflicts:
	paper.tex