Conditioning newsticker settings for non-laptop environment
Fixing merge conflicts
Adding some .d/elpa stuff