Merge pull request #5 from sinker/2015fellows

2015fellows merge to get my master up to normalz
add MozFest 2014 journalism schedule
update meta description
Merge pull request #6 from ryanpitts/master

add MozFest 2014 journalism schedule
Merge pull request #7 from sinker/master

getting master up to speed with post-fellows