Uni configuration setup
Merge branch 'master' of git://github.com/joshaw/dotfiles

Conflicts:
	email/mutt.symlink/aliases_auto
	email/mutt.symlink/certificates
	system/vimrc.symlink
	vim.symlink/bundle/vim-airline