changed location of R history file in bashrc
Merge branch 'master' of github.com:mfrey/settings
added my gitconfig without user section