correct gitconfig identation
strip trailing space in Rakefile
adjust osx config