start scheduling on Monday
got rid of debugger
merge master
api working
using new api everywhere
api working
using new api everywhere
removed puts
fixed position filter by ID; closes#1354
fixed location filter to use ID and removed All Locations option
removed position nested json in users query string
removed apostrophe in mixpanel track
merge conflict
removed nested location and position json from users
merge conflicts
Merge branch '1354' into 1343
removed git merge conflict garbage
pulled out buggy stuff
change underscore size to where
Merge pull request #1347 from affektive/1343

1343 using query parameters for users