Sets composer.lock filetype to json
Updates php-cs-fixer settings
Updates URL from ssh to https
Merge branch 'master' of github.com:jeremykendall/vim