Make tests run on both ruby 1.8.7 and 2.0.0
Update cardboard version to 2.1 in Gemfile
Merge pull request #17 from sebroeder/ruby-2.0-compatibility

Update template to be compatible with Ruby 2.0 (Mavericks system ruby)
Merge remote-tracking branch 'template/master'