Merge pull request #11 from hurtstotouchfire/master

Update website to match current live site, plus a couple other changes
Clean up layout files, remove analytics section for now
Add Gemfile for github-pages
Add a templated version of everything and remove the old Dreamweaver templates. Also some updates to header and footer links and an updated README
merged new gh-pages updates
Merge Kelly's updates
Remove CNAME from non-production forks
Try to fix links to css files and such
Try to fix links to css files and such again
Create CNAME file for pull request

There has to be a better way to do this...
Merge pull request #12 from nickbenes/master

Set up jekyll templates and file structure
Finish adding conference videos. Fixes #5
Merge pull request #14 from nickbenes/B_fix-conference

Finish adding conference videos. Fixes #5
Finished the conference videos