Add rule to set filetype to javascript when editing json.
Merge branch 'master' of https://github.com/afishnamedsquish/dotfiles

Conflicts:
	vim/vimrc
Fix missing endfunction.
Merge branch 'master' of https://github.com/afishnamedsquish/dotfiles
Add zshrc.