Add opencv
Merge branch 'master' of github.com:hagino3000/dotfiles

Conflicts:
	setup_mac.sh