:Merge branch 'develop' of https://github.com/Make-Magazine/makercon into staging

Reset from /develop
changing width to 12 columns
style change for videos and entry-titles
Merge branch 'staging' of https://github.com/Make-Magazine/makercon into staging

Pull from origin
Session track permalink #2
stylings for sessions page
Merge branch 'staging' of https://github.com/Make-Magazine/makercon into staging

* 'staging' of https://github.com/Make-Magazine/makercon:
  Session track permalink #2
taking out weird margins.
Session track permalink #3
Merge branch 'fix-session-formatting-2' into staging

Fixed .session
Dont display empty sessions under speaker
Formatted and conditionally display links
Formatted and conditionally display links #2
Formatted and conditionally sessions
Formatted Speaker Subtitles
Formatted Speaker Subtitles #4
Formatted Loop in Session page
Added permalink for speakers page
Added permalink for speakers (Track) page
Added permalink for speakers w/ slug