colors tweak
cleanup aliases
gitignore cleanup
install .aliases
gitignore separation
merge conflicts