Re-enble pip -e in setup_develop

We had a bad merge somewhere along the way which reverted the pip -e
part of things. Replace it.

Change-Id: I620bea80eac7ad53b5bfb79dd2b21c29ad1b2267
Merge "Re-enble pip -e in setup_develop"