Use user-independent dropbox dir
Merge remote-tracking branch 'origin/emacs24' into emacs24