projectile WIP
Merge branch 'Leif'
Merge remote-tracking branch 'origin/master' into Aaron