Minor changes
Fix the regexp to match included/required files in php
composer.lock is a json file
Merge branch 'master' of github.com:iqbalansari/dotEmacs