mkdir /vagrant/notebooks if it doesnt exist
pin our pip modules to specific versions
resolve merge conflict
Merge branch 'mrenoch-master'