adding json_format alias
add FindInFiles alias
add support for emmet
add git diff alias
Merge branch 'master' of github.com:jkliff/shell-misc-tools

Conflicts:
	install-vimrc.sh