Add key map to format json
Merge branch 'vundle' of github.com:ebruning/dotfiles into vundle

Conflicts:
	vimrc
Add ruby and rails bundles
Change font