Pull thoherr/puppet-railsapp from our branch again