Merge branch 'release/0.6.23' into develop
Merge branch 'master' into develop
Merge branch 'hotfix/ruby-1.9.2-hashify_domains-bug' into develop
convert facon lingo to mocha lingo
convert facon and_raises() to mocha raises()
fix a couple spec_helper include paths
convert should.not.receive to expects...never
adding a stub to make mocha happy

Mocha is a bit more fussy about "hey this method was called with
different arguments, even though that's not what you're trying to
test!"  So, making mocha happy.
add a simple document on how to run regular spec suite
Merge branch 'feature/switch_mocking_to_mocha' into develop
Revert facon->mocha spec changes

Facon was not runnable on 1.9.2, so switched to mocha.  Probably
would've been better to keep those changes on a topic branch until
I've dealt with other outstanding code (which was having merge
headaches with the facon->mocha changes).

Yossef fixed facon, and the upstream facon maintainer pushed his
changes to a new gem.  Now facon works on 1.9.2 so no need for the
mocha implementation (frankly I've long had some complaints about
mocha and it's JMock silliness).
include Madison Ruby 'Free Whiskey' talk links
Test edit, please ignore.

Srly.
Merge branch 'develop'