Cleans
deletes this file
Fixes current_branch
Merge branch 'master' of github.com:inside/dotfiles

Conflicts:
	.zshrc