Upstream Merge
Merge pull request #481 from jessevondoom/master

fixing up the AJAX parsing #ciskip
Merge pull request #482 from jessevondoom/master

errors with nonexistant cache. forcing it with gitignore fuckery. #ciskip
Merge pull request #483 from jessevondoom/master

working learn text, mobile login #ciskip
Upstream Merge
Merge pull request #484 from jessevondoom/master

jquery ui CDN #ciskip
Merge pull request #485 from jessevondoom/master

working username parsing (and display) for subdomains and subfolders #ciskip
Merged master fixed conflict.
Google Analytics
Update calendar.json
Merge pull request #486 from christopherleckie/master

Google Analytics
Update calendar_events.json
Update calendar_guestlists.json
Update calendar_venues.json
Update commerce.json
Update commerce_items.json
Update commerce_items_edit.json
Update commerce_orders.json
Update people.json
Update people_contacts.json