fix link to video_highlights
Merge pull request #43 from scipy-conference/video_highlights

fix link to video_highlights
Merge remote-tracking branch 'upstream/master'
fixed typo in Jodi's name
adding resources for keynote speaker info/page
updates to header area, adding tagline, dates
put keynotes in alphabetical order
dd url for sponsorship levels
Merge pull request #47 from polarbeardesign/content_updates_jri_001

Content updates jri 001
Serving static conference files from nginx
Add php support
Stupid errors
Fix deb
add php and root rules to 443 site
Fix certificate location
Merge pull request #50 from scipy-conference/port_aws

Adding php and files from old aws box.
added content to Plotting contest page
changing dev db back to original setting
Merge pull request #58 from polarbeardesign/content_updates_jri_002

added content to Plotting contest page - self merging
remove [local] on prod