Fixed file ownership problem for .gitconfig file by setting 'user' to 'WS_USER' for command execution
Added support for meld diff-tool
Merge branch 'pivotal-meld'