Updated pip requirements
Updated postactivate to depend on the checked out branch to determine dev mode
Updated TODOs
Merge remote-tracking branch 'origin/develop'