Merge pull request #48 from lisavogtsf/master

corrects styling, font problem, adds error catching to api controller
scope all price_query functionality to current_user
implement places vanity urls to show user instead of price_query
adds selected city name to site index
fix merge conflict
Merge pull request #49 from cameronjacoby/master

scope all price_query functionality to current_user; implement places vanity urls to show user instead of price_query
adds all uber types option
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

merging after pull request 49