Change versioning scheme, per #222

Hello @nicks, 

This may be confusing.

Please review the following commits I made in branch 'dpup-versioning'.

02dfcc2065e4d87d5cf3d11ccbbce0b6337adb7f (2014-09-13 12:07:26 -0700)
Change versioning scheme, per #222

R=@nicks