Merge pull request #214 from ndawe/master

update mailmap
Merge pull request #216 from ndawe/master

MRG: more sane setup.py
fix Char defaults in types.py