Merge branch 'b2' of https://github.com/alanpaklo/twofish.rb into b2

Conflicts:
	README.rdoc
Merge branch 'b2' of https://github.com/alanpaklo/twofish.rb into b2