Merge remote-tracking branch 'origin/master' into debian
Merge branch 'debian' of github.com:isis-group/isis into debian
clean up the dependencies a bit