Don't mess with Projectile's modeline text
Merge branch 'master' of github.com:bbatsov/prelude
Merge pull request #2 from bbatsov/master

Fetch upstream changes