Moved the function definitions for: spacemacs//trailing-whitespace spacemacs//set-whitespace-style-for-diff from: spacemacs-default/packages.el to: spacemacs-default/funcs.el