Merge pull request #1 from mrenoch/master

Split up Docker and Vagrant install instructions
Merge pull request #2 from mrenoch/master

setting up vagrant conf. documentation updates.
Update README.markdown
allow vagrant to auto correct ports

I run a lot of vagrants on my machine, so I need it to be able to auto correct ports
pylab inline mode

fixes #4.

IPython notebook complains about using the `--pylab=inline` parameter and suggests using `%matplotlib` instead but 1) I've never managed to get the latter to work in a docker/vagrant/server context and 2) for our purposes, I think it's good to ensure that inline graphs just always work instead of requiring students to remember to insert a `%matplotlib` cell in each notebook before they do any graphing (and God help you if you import matplotlib before doing that).
markdown tweaks
Merge pull request #3 from ccnmtl/auto-correct-port-forwarding

allow vagrant to auto correct ports
Merge pull request #5 from ccnmtl/pylab-inline

pylab inline mode