Merge https://github.com/ccding/go-logging

Conflicts:
	logging/fields.go