Fix a couple of paths
fix merge conflict caused by forced push
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of github.com:jefferis/DrosophilidDBM
Merge branch 'master' of 207.97.227.239:jefferis/DrosophilidDBM