Squashed commit of the following:

Date:   Wed Sep 24 20:05:40 2014 -0700

    Re-enable maps, add votes to seeds

    UI Tweaks

    Left-pane nav and Optimizing a little

    Upvotes WIP

    Refactored jbuilders
Styled map, fixed some rendering, removed old code
Proper upvotes relationship
User api, seed data
Tweaks to ui, seed data
Merge branch 'votes' of github.com:kellyjosephprice/ramblr

Conflicts:
	app/assets/javascripts/routers/location_router.js
	db/seeds.rb
Upvotes_cast, user API
Didn't push these changes from my desktop, grr argh.
Moved pane initialization to static_page, meh
Added User API
refactoring routers for users
turn map back on
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
Sort locations/markers by upvotes
lot's of N+1's....
Markers sort by upvotes
first pass at omnibar
Omnisearch autocompletes tags and titles