go fmt
OS X building fixes
Add old-style state file for testing