wrapped long lines
Merge pull request #411 from jkitzes/master

Update restricted status, date, tags for UCB bootcamp and fixed typo on Geomar page
Displaying instructors' names in boot camp pages.
* Adding instructor IDs to all upcoming boot camp pages
* Inserting instructors' IDs into boot camp pages
* Moving metadata files into root directory (so it can be used for instructors' names as well as blog entries)
* Translating instructor IDs into actual names
* Removing tabs from metadata file
Update Windows install instructions

1. Use msysgit instead of cygwin
2. Use Anaconda CE
3. Use new script for making msysgit behave more like *nix systems
Merge remote-tracking branch 'ethanwhite/windowssetup' into origin

* ethanwhite/windowssetup:
  Update Windows install instructions
Merging upstream changes
Merge pull request #410 from gvwilson/adding-instructors-to-boot-camp-pages

Adding instructors to boot camp pages
Replace some of the standard text with specific information for the Oxford DTC boot camp.
Add eventbrite link and a few minor tweaks.
Customized wording; Added registration, specific location
Merge pull request #413 from lmichael107/master

Update UW April bootcamp webpage
Merge pull request #408 from joonro/wrap-long-lines

Wrapped long lines
Added registration widget, removed reference to Duke (for now?)
Merge pull request #415 from amyrbrown/nescent-reg

Added registration widget, removed reference to Duke (for now?)
Merge branch 'master' of https://github.com/swcarpentry/website

Edited oxford-dtc info manually to resolve conflict.
Merge pull request #414 from jonc125/master

Update details for May boot camp at Oxford
Updating staffing page
Merge pull request #416 from gvwilson/updating-staffing-2013-03-24

Updating staffing page
Thinking about using the Notebook as a teaching tool
Merge pull request #417 from gvwilson/using-notebook-as-a-teaching-tool

Thinking about using the Notebook as a teaching tool.