Change color codes for indent guides.
Merge branch 'master' into submoduleupdate
Update submodules