Update to tox 1.6 and setup.py develop

Change-Id: Ie81f5ee5a8f7835f0600a4f4f46b25920d424e71
Merge "Update to tox 1.6 and setup.py develop"