added ruby 2.1.0, removed ruby 1.9 support
added some default attributes
Merge branch 'master' into resource