styling
Merge branch 'design' of github.com:conveyal/commute-planner into design

Conflicts:
	client/options-view/option/template.html