Upgrade to Ruby 2.1 as default
Update TODOs