Added description to conference and program segment to splash

Added tracks to program component

Rebased and updated the new navigation for splash
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
Add tickets to registration segment
Merge pull request #170 from gopesht/add_tracks_to_program_component

Added tracks to program component
Fixed view specs, passing
updated db/schema.rb
Merge pull request #177 from gopesht/add_tickets_to_registration_segment

Add tickets to registration segment