Making sure the error message prints
Fixing issue #233 - adding content type override for feed.xml.

This sets the content-type to application/rss+xml
Fixing meta attribute in office-hours page for title.
Adding blog post about online office hours
Merge branch 'master' of github.com:swcarpentry/website
Prettying up the table and html on the 90 second pitch page.
Merge pull request #235 from gvwilson/master

Fixing error messages in utility file.
Blog post about record and playback in the Notebook
Merge pull request #240 from gvwilson/master

Blog post about record-and-playback in the IPython Notebook.
Fixing typo in FAQ
Merge pull request #241 from gvwilson/master

Fixing typo in FAQ.
Merge pull request #238 from jiffyclub/90-seconds-pretty-table

Prettying up the table and html on the 90 second pitch page.
Updating Columbia boot camp page with setup instructions link
Merge pull request #244 from gvwilson/master

Adding link to setup instructions to Columbia boot camp page.
Blog post about how to become an instructor
Merge pull request #246 from gvwilson/master

Blog post about how to become an instructor.
New blog post from Joshua Peterson, and fixing category of post from Hanah Chapman
Merge pull request #248 from gvwilson/master

Blog post from Joshua L. Peterson
Updating instructions for AMOS
Merge pull request #249 from gvwilson/master

Updating setup instructions for AMOS