added django-ical to the depends file
Merge branch 'master' of git://github.com/acen-uiuc/liquid
pulled in ace's changes and modified to work
adds account password via setup script
first push of adding conference shenanigans to liquid! here's to
everything not breaking!
Merge pull request #94 from colegleason/master

Merge of Ace's changes, among other things
landing page tweaks
refactor of conference landing page
added email address, fixed typo, etc
Merge pull request #95 from colegleason/master

r | p 2013 landing page website (not waiting for a review, because ain't nobody got time for that)
fix 2013 url
updated subscriber url
Fixed typo on rp 2013
Merge branch 'master' of https://github.com/acm-uiuc/liquid
fixed bug in rp 2013 subscribe code
refactor of landing page
Override of ordering in lists in new group form
Added SigMusic redirects
Merge pull request #97 from CJS7070/master

SigMusic Redirects
Update for new top4 and other leadership