Restructing dotfiles
Update local/.gitconfig
updating local .dotfiles
fixing merge conflicts
Updating dotfiles
Updating .localrc
Merge branch 'master' of https://github.com/codefuel/dotfiles