Renamed `dropbox-directory' to `external-directory'.
Merge branch 'master' of github.com:nanasess/dot.emacs