Re-enable evil
Committing latest changes. Not sure if elpa should be checked in