Added log folder to .gitignore
Merge branch 'master' of https://github.com/sambostock/yoorbell
Merge branch 'master' into config-format

Conflicts:
	.gitignore