Change name of dev version

Needed to conform with pep440, change 1.5.x to 1.5.dev1
Merge pull request #3941 from jenshnielsen/dev_version

MNT : Change name of dev version to be pep440 compliant