NOJIRA: Temporarily removes CNAME in the hopes that GH Pages will publish this repo.
NOJIRA: Readds CNAME so that GH Pages publishes to www.floeproject.org.
NO-JIRA: Updated link for Learner Uptions to point to Climate Change demo.
Merge branch 'gh-pages'

* gh-pages:
  NOJIRA: Readds CNAME so that GH Pages publishes to www.floeproject.org.
  NOJIRA: Temporarily removes CNAME in the hopes that GH Pages will publish this repo.
Merge remote-tracking branch 'jhung/master'

* jhung/master:
  NO-JIRA: Updated link for Learner Uptions to point to Climate Change demo.
FLOE-180: Adding the floe narrative on an about page
FLOE-180: Correct a misunderstanding: New narrative replaces old front page; not an 'about' page
FLOE-180: Fixing file perms.
FLOE-181: First pass at adding the prefs editors screencast.
FLOE-180: Fixes and styling tweaks in response to feedback.
Merge branch 'FLOE-180' of github.com:acheetham/floeproject.org into FLOE-180
Merge branch 'FLOE-180'

* FLOE-180:
  FLOE-180: Fixes and styling tweaks in response to feedback.
  FLOE-180: Fixing file perms.
  FLOE-180: Correct a misunderstanding: New narrative replaces old front page; not an 'about' page
  FLOE-180: Adding the floe narrative on an about page
Merge branch 'master' into FLOE-181
FLOE-181: Updated links and text for FLOE index.html.
Merge remote-tracking branch 'jhung/FLOE-181' into FLOE-181
FLOE-181: Create a page for the prefs editors video, instead of a news item.
FLOE-181: Fixed a typo
Merge remote-tracking branch 'acheetham/FLOE-181'

* acheetham/FLOE-181:
  FLOE-181: Fixed a typo
  FLOE-181: Create a page for the prefs editors video, instead of a news item.
  FLOE-181: Updated links and text for FLOE index.html.
  FLOE-181: First pass at adding the prefs editors screencast.
FLOE-185: Updated the opening section to address feedback.
Merge remote-tracking branch 'acheetham/FLOE-185'

* acheetham/FLOE-185:
  FLOE-185: Updated the opening section to address feedback.