Remove useless php.ini from root
Add .gitignore/.hgignore
Merge branch 'master' of github.com:c9/c9-template-root
Add simple script to merge root workspace template changes to other templates
Merge branch 'master' of github.com:c9/c9-template-root
Use git-keep-alive
Merge branch 'master' of github.com:c9/c9-template-root
Merge remote-tracking branch 'origin/master'