Update a few aliases
Update git-aware-prompt submodule