Add simple script to merge root workspace template changes to other templates
Use git-keep-alive
Merge remote-tracking branch 'root/master'

Conflicts:
	bin/init.sh
Add more .{git,hg}ignore entries following https://github.com/github/gitignore