saving nohup jobid
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
changed db path
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
who knows
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
Merge branch 'master' of https://github.com/abelsonlive/meatwaves
fixing merge conflicts