Added line to source machine-specific settings from a separate file
Merge branch 'master' of https://github.com/vis-viva/dotfiles