minor changes
Merge pull request #3 from kbourgoin/pydata2014

merged!!!!!!!