λ
Merge branch 'master' of github.com:aoisensi/dotfiles

Conflicts:
	.gitignore
	.vim/bundle/neobundle.vim
yes