merge PC laptop and Mac mini pentadactyl config
ignore the undo directory