Tweaks.

Add some merge stuff to .gitconfig
Add more apps to init.