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.
Merge pull request #225 from CJS7070/master

Change to new top4
Merge pull request #226 from CJS7070/master

More contact page updates
Change conference dates.
added some troubleshooting to readme and fixed requirements
fixing readme formatting
Merge pull request #230 from ClareCat/master

Readme and install stuff fix
added history to conference
added new files
oops
oops
cannot make a venv to save my life apparently
okay fixed
Merge pull request #231 from ClareCat/master

Added history
pretty sure this is fixed, but login is fucked
Merge branch 'master' of github.com:ClareCat/liquid
getting jobfair ready for 2014
Merge pull request #232 from ClareCat/master

getting jobfair ready for 2014
should be ready for jobfair