Some local changes
Merge branch 'master' of https://github.com/sagargp/dotfiles
Added a gitconfig file