Move config.ru creation into its own class for inclusion where it is needed.  In this case, puppet::server::thin and puppet::server::unicorn
Merge branch 'rackmaster'