Merging recent updates, removing PHP and adding .gitignore for local/work config