updates
new aliases
Merge branch 'master' of github.com:machinshin/dotfiles

Conflicts:
	.irssi/chaves.theme