More misc. stuff I should've committed earlier.
Merge pull request #4 from adhameer/master
Add "| n, str" crap for Python 3.2 compatibility.
Merge remote-tracking branch 'upstream/master'
Better semantics for evolution tables.