Merge pull request #209 from ClareCat/master

added conference updates
Merge pull request #210 from ClareCat/master

fixing links
Upgrade python-ldap to newest version. Fixes #208.
Merge pull request #212 from colegleason/master

Upgrade python-ldap to newest version. Fixes #208.
Move auth to Campus AD. fixes #217
Remove text about cluster password
Merge pull request #218 from colegleason/auth

Move auth to Campus AD. fixes #217
Merge branch 'auth'
Make login page text more helpful
Merge pull request #220 from CJS7070/TemplateChanges

Make login page text more helpful
Update README.md
Update Caffeine link to a woring one.
Merge pull request #223 from CJS7070/master

Update Caffeine link to a working one.
Removed link to Chroma livestream

It no longer exists - It used to be in RJ's home dir.
Change to new top4
Merge pull request #225 from CJS7070/master

Change to new top4
More updates to contact page
Merge pull request #226 from CJS7070/master

More contact page updates
Change conference dates.
Merge pull request #230 from ClareCat/master

Readme and install stuff fix