merge of gitconfig + install fixes