Added registration segment to display description, period

Controller test for Conference#show

houndci fixes

Rebased with single entry for navigation branding

Conditional rendering of splash navbar

spec/views/conference/show.html.haml_spec.rb

@@ -7,4 +7,15 @@ describe 'conference/show.html.haml' do
     expect(render).to include("#{@conference.description}")
     expect(view).to render_template(partial: 'conference/_program')
   end
+
+  it 'renders registration partial' do
+    @conference = create(:conference, registration_description: 'Lorem Ipsum Dolor',
+                                      registration_start_date: Date.today,
+                                      registration_end_date: Date.tomorrow)
+    assign :conference, @conference
+    render
+    expect(rendered).to include("#{@conference.registration_description}")
+    expect(rendered).to include("Register for #{@conference.short_title}")
+    expect(view).to render_template(partial: 'conference/_registration')
+  end
 end