Initial import.
Merge branch 'master' of github.com:richardbutler/socket.log

Conflicts:
	.gitignore
	README.md