wip
Merge branch 'master' into move-old-code#79108488

Re-apply changes to old/main.go.

Signed-off-by: Steve Powell <spowell@pivotal.io>

Conflicts:
	main.go
Remove debug code

Signed-off-by: Steve Powell <spowell@pivotal.io>

[#79108488]
[move-old-code#79108488]: move code to old/

Some files are needed at the top-level and are not moved down.

The Makefile and main.go are split into corresponding files
in old/ and shims which delegate.

Signed-off-by: Steve Powell <spowell@pivotal.io>
[move-old-code#79108488]: delete extraneous .gitignore

Signed-off-by: Steve Powell <spowell@pivotal.io>
Merge branch 'move-old-code#79108488'

[#79108488]