updated 2-tab filetypes and added nav keys for vim
added paths in zshrc
Merge branch 'master' of github.com:awmartin/dotfiles

Conflicts:
	vimrc
	zshrc
removed nav logic for 0 and $ in vim. temp fix for gconftool confusion.