Test new functionality
Be liberal for Template
Liberal with ResourceProperty, and make JRuby compatable (since I have a
reason to hate **options now)
One last bit
Also build 1.9
Be more clear about what this is doing
doh
Merge branch 'master' into rm/be-liberal

Conflicts:
	lib/skywriter/resource.rb
	lib/skywriter/resource_property.rb
Merge pull request #12 from otherinbox/rm/be-liberal

Be liberal with argument names, and make 1.9-compatable
Merge branch 'master' into rm/merge-template

Conflicts:
	lib/skywriter/template.rb