...
Merge branch 'master' of https://github.com/benekastah/osx-bootstrap

Conflicts:
	home/.gitconfig
	home/.vim/au.vim
	home/.zshrc
add irssi and mutt config dirs
Merge branch 'master' of https://github.com/benekastah/osx-bootstrap
Merge branch 'master' of github.com:benekastah/osx-bootstrap

Conflicts:
	home/.irssi/scripts/autorun/adv_windowlist.pl
	home/.irssi/scripts/autorun/notifier.pl
	home/.irssi/solarized-universal.theme
	home/.zshrc