Merging my laptop's stumpwmrc with my desktop's