added one options_controller test
added index to trip_id in errands table
Merge branch 'master' into performance
Merge pull request #25 from LightningLord/performance

Performance