more formatting changes
Merge branch 'master' of github.com:alexzorin/onapp

Conflicts:
	cmd/config.go
	cmd/log/log.go
	cmd/log/log_windows.go