Fix my institution.
Merge branch '2013-05-oxford-dtc' of https://github.com/swcarpentry/boot-camps into 2013-05-oxford-dtc

Manually merged Welcome.ppt by adding the etherpad link to my version.
A better merge of the welcome slides - I missed one of Mario's changes.
Merge branch '2013-05-oxford-dtc' of https://github.com/swcarpentry/boot-camps into 2013-05-oxford-dtc
Fix a few typos and final tweaks to Matlab session.
Fix formatting and add link to more scipy lecture notes.
Another attempt to fix formatting.
Final updates to NumPy session notes.
Final tweaks to numpy exercise.
Merge pull request #85 from jonc125/2013-05-oxford-dtc

Some (hopefully final!) updates for my sessions in tomorrow's boot camp