Now up-to-date with master.
Merge branch 'master' of https://github.com/SGarfinkel/pyatom
Now up to date with master