Change name of dev version

Needed to conform with pep440, change 1.5.x to 1.5.dev1
Merge branch 'dev_version'