massive update to dotfiles from work-computer (pre pull of all synced versions from home)
merge pull conflicts back to master