Remove merge errs
Updates reqs and README for install
Merge branch 'master' of github.com:lincolnloop/LightningTalksLive
settings STATIC/PATHs update
Merge branch 'master' of github.com:lincolnloop/LightningTalksLive
STATICFILES_DIRS settings
Updates to footer and header
Merge branch 'master' into stub-styles