Always assume bashrc-defaults.sh exists
Remove useless php.ini from root
Add .gitignore/.hgignore
Merge remote-tracking branch 'root/master'