Merge pull request #113 from robintw/2013-06-southampton

First update of Soton bootcamp
Merge pull request #114 from robintw/2013-06-southampton

Updated README to replace Bitbucket with Github
Merge pull request #123 from robintw/2013-06-southampton

Updated Welcome pres & README
Updated shell doc and odp for southampton
Added IPython to requirements
Merge pull request #126 from seumasmorrison/2013-06-southampton

2013 06 southampton
Updated Ubuntu install instructions
Version control using git
Merge remote-tracking branch 'NelleV/2013-06-southampton' into 2013-06-southampton

* NelleV/2013-06-southampton:
  Version control using git

On Sun, Jun 02, 2013 at 11:03:18AM -0700, Robin Wilson wrote:
> Ok - merging sounds good then. Could either @wking or @NelleV do the
> merge, as I don't have permissions.
Add ipython to Ubuntu instructions
Updated setup instructions incorporating seumasmorrison's changes
Merge pull request #130 from monsieurrigsby/2013-06-southampton

Updated Ubuntu install instructions
Updated Welcome and Wrap Up (Conclusion) presentations to be those actually used at the boot camp.