Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Bind ace-jump-mode to s-. as well
  Change C-c SPC to C-c j to avoid a conflict in org-mode
Merge branch 'master' of github.com:WaYdotNET/prelude

* 'master' of github.com:WaYdotNET/prelude:
  Update prelude-lisp.el
  Mention guru-warn-only
Use ruby-mode for Podfile

A Podfile is used for CocoaPods to do a Bundler like dependency
management in XCode projects. Similar to a Rakefile or a Gemfile the
Podfile contains a dependency description in a Ruby based DSL.
Merge pull request #473 from jehrhardt/podfiles

Use ruby-mode for Podfile
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Use ruby-mode for Podfile