A few minor changes regarding OSX support
Remove poorly supported magithub package
fix ensure module exec-path-from-shell
Merge pull request #283 from marivas/fix-ensure-module-prelude-osx

fix ensure module exec-path-from-shell
Allow configuring cleaning white space on save

This condition is checked when saving if the existing
whitespace-cleanup is set instead of when the when prog-mode is is
entered.  This way it can be over-ridden by either dir-locals or
file-local variables.
Minor refactoring
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Ignore projectile-bookmarks.eld
Fix docstring
Add prelude-clean-whitespace-on-save to README.md

Also fix incorrect indentation in prelude-editor.el changes.
Good catch bbotsov!
Merge pull request #285 from nathanstitt/clean-whitespace-on-save

Make cleaning white space on save an option
Add prelude-indent-defun
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Code style
Code style
Fix a typo
Merge remote-tracking branch 'upstream/master'