Edit conflicts by Mona
Merge branch 'master' of https://github.com/andymcfee/dotfiles

* 'master' of https://github.com/andymcfee/dotfiles:
  tweaks
  Fixed dotfilespls
Merge branch 'master' of https://github.com/andymcfee/dotfiles

* 'master' of https://github.com/andymcfee/dotfiles:
  git config
Merge branch 'master' of https://github.com/andymcfee/dotfiles

* 'master' of https://github.com/andymcfee/dotfiles:
  syntax