removed the kaffeefleck layout
added alias to show merged/unmerged branches