update gitconfig with user details, fixed vundle package in vimrc added completion ignore for pycsmbuilder to zsh_aliases
add remote desktop alias for martin
solve merge conflict