Merge pull request #82 from marioa/2013-05-oxford-dtc

2013 05 oxford dtc
Merge pull request #83 from marioa/2013-05-oxford-dtc

2013 05 oxford dtc
Merge branch '2013-05-oxford-dtc' of git://github.com/swcarpentry/boot-camps into 2013-05-oxford-dtc