Merge "Clean up some initial repo creation boilerplate"