Multiple changes

In .vimrc: Added quick navigation shortcuts
In coffee.vim: no auto comment insertion on O command
In git.zsh: Changed prompt to match existing prompt style when merging
In .zshrc:	- Added history stuff
			- Added git shortcuts
			- Added vim alias, that opens in a new urxvt with custom
			  SERVER
			- Added tex-watch alias, for watching LaTeX files

Other minor changes not worth mentioning (typos)
Merge branch 'adriaan' of github.com:ChocolateCookies/arch-config into adriaan

Conflicts:
	dotfiles/.zsh/git.zsh