swc-installation-test-2.py: added support for py.test
Merge remote-tracking branch 'mikej888/setup-pytest'

* mikej888/setup-pytest:
  swc-installation-test-2.py: added support for py.test
Merge https://github.com/swcarpentry/boot-camps into 2013-06-wise-intermediate
added etherpad links