Preventing lock files.
Merge branch 'master' of github.com:dlineberger/.emacs.d