notebook changes
Merge branch 'master' of github.com:cswelcher/2013-lamprey