Merge remote-tracking branch 'upstream/master'

Conflicts:
	Library/Formula/rethinkdb.rb
Merge branch 'master' of https://github.com/larkost/homebrew