version number update
Merge branch 'master' of https://github.com/modflowpy/flopy
Update setup.py. Still not completely happy with the revisions.