Merge pull request #6 from toranb/master

updated vimrc file
updated emacs and oh-my-zsh settings
Merge pull request #7 from toranb/master

yet another vimrc bump
fixed vimrc and gvimrc symlinks
rebase with matts config