Another airport
Merge branch 'master' of github.com:swcarpentry/site
Adding Ethan White to ESA bootcamp instructors
Merge pull request #45 from ethanwhite/updated-esa-instructors

Adding Ethan White to ESA bootcamp instructors
Using full http:// in URLs for dev and install
Merge pull request #47 from gvwilson/full-url-in-feed

Using full http:// in URLs for dev and install
added some notes on getting jekyll/redcarpet going on OS X
Adding talks and papers
Corrected instructors for 2013-07-18-notredame bootcamp page.
Added web site entry for Michigan State University 2013 bootcamp.
Fixed end date for 2013-09-09-caltech bootcamp entry.
RSS feed uses dc:creator instead of author

The author element must contain an email address, but since we
likely don't want to reveal those, we can instead use the Dublin
Core 'creator' element which allows just a name.
RSS feed pubDate RFC2822 formatted
Merge pull request #43 from ahmadia/readme-maruku

Need a clean(er) solution to Maruku/Redcarpet rendering problems.
Added js/jquery-1.9.1.min.js to site
htaccess rewrite rules for old /3_0/ and /4_0/ urls
Adding web page for Harvard.
Merge pull request #51 from amyrbrown/harvard

Adding web page for Harvard.
Merge pull request #35 from pipitone/local-jquery

Include jquery.js in site rather than loading from jquery.com
Merge pull request #50 from pipitone/feed-validation-fixes

Feed validation fixes (fixes #46)