fixed json filetype in vimrc
Merge branch 'master' of github.com:ryanatk/setup

Conflicts:
	targets/vimrc