Removing dir-local-variables hack
Merge branch 'master' of github.com:djwhitt/emacs-starter-kit