Update Git_Repo folder name
Merge branch 'master' of github.com:samjbmason/dotfiles

Some merge conflict
Remove postgres path