Don't mess with Projectile's modeline text
Merge branch 'master' of github.com:bbatsov/prelude
Merge remote-tracking branch 'refs/remotes/upstream/master'