Add il json
Adding chicago to supported cities
Merge branch 'master' into chicago
HF update
Merge branch 'master' into chicago
Chicago moving from hostname to a scoped route in the events
Geo rake tasks, update more stuff, add catch-all route
Undo global catch-all
Use lat/long that the app sends
Additional SMACSS
Removed main.scss as I completed SMACSS.
Create affiliates - affiliates are when events should be 'attached' to a particular event.

Affiliates are a stepping stone to creating private events.

TODO:
Public affiliations (replacing the 1-off VM stuff with affiliations)
Affiliate Mods can edit affiliated events
Private events
Fix affiliation moderators - move the moderator bit to the association and no longer make it a role
Merge Chicago with Affiliations
Whoops
Fix another merge conflict
Fix tabbing / spacing, double to single quotes, and other ruby-esque style issues in the code.
More fixes
Move affiliate image to left of map listing
Merge remote-tracking branch 'upstream/master'