Merge pull request #90 from jashkenas/master

merge to master
Merge pull request #91 from jashkenas/master

fix export
Some more mainly whitespace removal
Some more mainly whitespace removal
Some more mainly whitespace removal
Merge pull request #92 from jashkenas/netbeans

Netbeans