Merge .gitconfig and README from master