Add ephemeral directories (/tmp/ and /log/) to .gitignore.
Merge master into master.
Remove development log.