OS X fullscreen changes
Adjust init for merge
Ingore elpa and melpa dirs going forward