some dotfile updates
merge conflicts in slate resolved