vim: yaml spacing
Merge branch 'master' of github.com:hackaugusto/dotfiles
openbox: multi monitor stub config
Merge branch 'master' of github.com:hackaugusto/dotfiles

Conflicts:
	.vimrc