Fixed duplicate whitespace setting.
Merge branch 'master' of https://github.com/christopherbalz/.emacs-