only require padrino once
Merge branch 'master' of github.com:middleman/middleman
use latest padrino