Added support for Ruby 2.1.1
Merge branch 'master' of github.com:lotus/controller