Hooked options back up
Merge branch 'design' of github.com:conveyal/commute-planner into design
Minor adjustments