misc dotfile changes (intelduo)
Merge branch 'pre-a' into a