using ruby 2.0.0 and padrino 0.11.0.
updating code to padrino 0.11.0.
Merge branch 'master' into upgrade
upgrade to padrino 0.11.1.
Merge pull request #326 from fhsclock/upgrade

Upgrade to Padrino 0.11.0.