Always assume bashrc-defaults.sh exists
Remove useless php.ini from root
Add .gitignore/.hgignore
Add simple script to merge root workspace template changes to other templates
Use git-keep-alive
Merge remote-tracking branch 'root/master'
Add more .{git,hg}ignore entries following https://github.com/github/gitignore