Upgraded to ruby 2.1.2
Merge pull request #185 from fs/upgrade-ruby-2.1.2

Upgraded to ruby 2.1.2
Merge branch 'master' into group-site-prism-pages-and-sections

* master:
  Upgraded to ruby 2.1.2