ha, I'm back on linux.
Merge github.com:bronson/dotfiles