Merge branch 'master' of github.com:kellyjosephprice/ramblr
Squashed commit of the following:

Date:   Fri Sep 26 04:16:36 2014 -0700

    Adding Places Autocompletion WIP

    Syntax Errors

    Autocomplete title + body

    li CSS tweak

    Quick refactor / created SearchView class

    Omnisearch autocompletes tags and titles

    Markers sort by upvotes

    Sort locations/markers by upvotes
    lot's of N+1's....

    Merge branch 'heroku' into votes

    Conflicts:
    	app/assets/javascripts/routers/location_router.js
    	app/assets/javascripts/routers/user_router.js
    	app/assets/templates/layouts/navbar.jst.ejs
    	app/assets/templates/locations/search.jst.ejs
    	app/controllers/api/users_controller.rb
    	app/models/user.rb
    	app/views/api/users/_user.json.jbuilder

    refactoring routers for users

    Moved pane initialization to static_page, meh

    Upvotes_cast, user API
    Didn't push these changes from my desktop, grr argh.
Didn't remove require autocomplete-rails
Clean static pages
Merge branch 'master' into omnibar

Conflicts:
	app/assets/javascripts/views/locations/search.js
	app/controllers/api/search_controller.rb
	config/routes.rb
Omnibar will autocomplete/search, but broken
Forgot to add this
Search works!