Updated deployment logic

... to account for both deployment scenarios (iterative and release).
Merge pull request #1643 from rhyolight/pypi-003

Updated deployment logic