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)
updated deps and added spec/stdlib to gitignore
Merge pull request #19 from tarebyte/master

Updated deps and added spec/stdlib to gitignore
move to svg status badge as an example
trying to update dependencies to fix issues people have been experiencing
Merge pull request #21 from boxen/update-deps

Update dependencies
Merge remote-tracking branch 'template/master' into update-deps

Conflicts:
	README.md
	spec/fixtures/Puppetfile
Add version string
Merge branch 'update-deps'