small changes
Merge branch 'master' of https://github.com/pyamg/pyamg

Conflicts:
	todo.md