Merge common samhainrc changes into handel's version