stop force-pushing to master, rename branches

Signed-off-by: David Varvel <dvarvel@pivotallabs.com>