version.py version and short_version are inconsistent
The new dev versioning scheme from #4046 introduced an inconsistency:

```
user1@localhost ~/src/pandas (git)-[master] % cat pandas/version.py         
version = '0.13.0-1-gaf9c025'
short_version = '0.14.0'
```

https://github.com/pydata/pandas/issues/5796#issuecomment-31368550

short_version means we're in the 0.14.0 cycle, while version tells us how
many commits after the latest tag (0.13.0) we're at, giving an order on dev
versions. It's not intuitive, but it does what we need.

Not sure if this actually needs fixing or not.

**correction**: #5803 

```
user1@localhost ~/src/pandas (git)-[master] % cat pandas/version.py         
version = '0.13.0-9-gb3f6972'
short_version = '0.13.0'

```
