Changed settings, added bugfixes

Changed dock icon size from 18 to 36.
Added .vim/swap folder.
Fixed PATH variable in .zshrc file. Now brew version of the apps are in
priority place.
Fixed rsync copy of the dotfiles in setup.sh
Git-specific changes

Added pretty-log and gitconfig from loonkwil Git repo