Fixing master

@bbatsov I suggest you reset to https://github.com/bbatsov/projectile/commit/d68b2685bffe7a805c7ded107925476626e6b1dd and then rebase this branch (or merge with fast forward).

PS. Let's make sure travis runs ok before merging!