Reset to b7ce36a and squashed to a single commit per @jreback request
Merge branch 'master' of github.com:benjaminmgross/pandas