Forgot to commit these final changes to smooth.py last night
Fixed up conflicts in todo.md
Merge branch 'master' of https://github.com/pyamg/pyamg

Conflicts:
	todo.md