more changes
added references
iter
Merge branch 'cameron' into varoquaux

Conflicts:
	paper.tex