.extra: move gaia aliases to gaia.sh
.gitignore: sublime files
remove bootstrap script
.gitconfig: diff3 conflictstyle