Allow for Custom Distance and Bearing Columns

I ran into an issue where the `SELECT AS distance` was conflicting with a column that I have in that table called `distance`, which holds data like '1K', 'Half Marathon', etc.  The database was essentially ignoring the calculated distance and ordering by the actual distance column instead of the calculated distance column.

This pull request allows a user to set a custom distance and bearing column.