The $DOTFILES_DIRECTORY global is now conditioanlly set
Merge branch 'master' of github.com:whitneyit/dotfiles