Add 2.1.0 and 2.1.0-preview2
typo
Add jruby.
Merge pull request #68 from grosser/grosser/jruby

Add jruby 1.7.6
Merge remote-tracking branch 'origin/master' into kill-versioned-classes

Conflicts:
	spec/fixtures/Puppetfile
	spec/fixtures/Puppetfile.lock
Port 2.1.0* to hiera
Port jruby to hiera