Format json
Merge branch 'master' of github.com:alexchan/dotfiles