Added tmp and log directories to .gitignore
Merge branch 'master' of https://github.com/cdlib/cedilla_services