Now uses the more semantically correct AND operator

Conflicts:
	lib/jekyll/site.rb