upkeep

* add gl and gf aliases
* set PS1 to show basename of current directory
* add 'git br(anch)' alias
Merge branch 'master' into feature/upkeep

Conflicts:
	install
Merge pull request #2 from marek-sezemsky/feature/upkeep

upkeep