remove per year/trip selector
buttons for style guide
resolve conflict

Conflicts:
	client/style-guide/style.css
dynamic "We Found X Options" header
Descriptive header for each option (per #30 / #38)
Remove cost/calories box, adjust spacing
Mode button options
More button styling
remove per year/trip selector
dynamic "We Found X Options" header
Descriptive header for each option (per #30 / #38)
Remove cost/calories box, adjust spacing
Merge branch 'design_demory' of github.com:conveyal/modeify into design_demory
"About" page (per #24)
Always show access mode icon for transit trips in simple view
Merge branch 'design_demory' of github.com:conveyal/modeify into design_demory
Sentence case
Remove extra div
buttons styles – v2
Clean up planner-nav html