more machine-specific tweaks.  this probably breaks everything
Merge branch 'master' of github.com:axelmagn/dotfiles