cleanup n fixes
Merge branch 'master' of https://github.com/dmerc/dotfiles