Removed internal constants deps, switched to virtualenv.
Fixed merge issues.