Merge branch 'alameda' of https://github.com/eldridgejm/dotfiles into alameda
Merge branch 'alameda' of https://github.com/eldridgejm/dotfiles into alameda