Adding more instructor information
Moving people who aren't really involved in the project into '-unused' directories
1. Adding the UC Davis bootcamp to the roster.
2. Modifying the bootcamp XML generation script to ignore Unicode errors in addresses - this is a hack to handle the Brazilian bootcamp for now.
National Oceanography Bootcamp at Southampton

Added National Oceanography Bootcamp at Southampton held on May 8-9, 2014.
New badges
Fixing the mailto link
Another airport
Merge branch 'master' of github.com:JorySchossau/site into schossau-master
Blog post from Jory Schossau about assessment findings
Merge pull request #498 from DevasenaInupakutika/patch-1

National Oceanography Bootcamp at Southampton
Fix to UnicodeEncodeError at bin/make_bootcamp_rss_feed.py
Merge pull request #499 from r-gaia-cs/fix-bootcamp-rss

Fix to UnicodeEncodeError at bin/make_bootcamp_rss_feed.py
Adding Sheldon McKay
Adding John Corless
Blog post about data carpentry workshop
Adding Aaron Garoutte
Removing out-of-date badges
Blog post about upcoming lab meeting
Using Unicode for fields of calendar entries
Updating blog post about Data Carpentry