Allow FreeBSD to correctly report number of CPUs on host
Merge branch 'master' of github.com:dbye/oh-my-zsh

Conflicts:
	plugins/bundler/bundler.plugin.zsh
Restored plugins/bundler/bundler.plugin.zsh
Add support for FreeBSD - use the same scheme as Darwin for detecting number of CPUs on host