Small typos, errors.  Fixed amalgamate (or lack of)
Merge branch 'master' of https://github.com/pyamg/pyamg