Switch Everything to Ruby 2.0
Merge remote-tracking branch 'origin/master' into ruby2
Merge pull request #24 from pbyrne/ruby2

Switch Everything to Ruby 2.0