svg indent
move bootstrap.sh
Merge remote-tracking branch 'upstream/master'

Conflicts:
	linux-setup/bootstrap/fork.sh